August 2023 - Wine-Commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Separate the HTMLLocation from the outer window.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: wine Branch: master Commit: c993bc6e5f139794f8d94199844ef053ed40c5a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/c993bc6e5f139794f8d94199844ef0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Aug 30 16:05:13 2023 +0300 mshtml: Separate the HTMLLocation from the outer window. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmllocation.c | 50 +++++++++++++++++++++++++++++++------------- dlls/mshtml/htmlwindow.c | 32 ++++++++++++++++++---------- dlls/mshtml/mshtml_private.h | 8 +++++-- 3 files changed, 62 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 02f503969db..35446c57bd3 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -36,19 +36,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -static inline HTMLOuterWindow *get_window(HTMLLocation *This) -{ - return CONTAINING_RECORD(This, HTMLOuterWindow, location); -} - static IUri *get_uri(HTMLLocation *This) { - return get_window(This)->uri; + return This->window->uri; } static HRESULT get_url_components(HTMLLocation *This, URL_COMPONENTSW *url) { - const WCHAR *doc_url = get_window(This)->url ? get_window(This)->url : L"about:blank"; + const WCHAR *doc_url = This->window->url ? This->window->url : L"about:blank"; if(!InternetCrackUrlW(doc_url, 0, 0, url)) { FIXME("InternetCrackUrlW failed: 0x%08lx\n", GetLastError()); @@ -93,13 +88,27 @@ static HRESULT WINAPI HTMLLocation_QueryInterface(IHTMLLocation *iface, REFIID r static ULONG WINAPI HTMLLocation_AddRef(IHTMLLocation *iface) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - return IHTMLWindow2_AddRef(&get_window(This)->base.IHTMLWindow2_iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + return ref; } static ULONG WINAPI HTMLLocation_Release(IHTMLLocation *iface) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - return IHTMLWindow2_Release(&get_window(This)->base.IHTMLWindow2_iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + if(!ref) { + IHTMLWindow2_Release(&This->window->base.IHTMLWindow2_iface); + release_dispex(&This->dispex); + free(This); + } + + return ref; } static HRESULT WINAPI HTMLLocation_GetTypeInfoCount(IHTMLLocation *iface, UINT *pctinfo) @@ -139,7 +148,7 @@ static HRESULT WINAPI HTMLLocation_put_href(IHTMLLocation *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - return navigate_url(get_window(This), v, get_uri(This), BINDING_NAVIGATED); + return navigate_url(This->window, v, get_uri(This), BINDING_NAVIGATED); } static HRESULT WINAPI HTMLLocation_get_href(IHTMLLocation *iface, BSTR *p) @@ -500,7 +509,7 @@ static HRESULT WINAPI HTMLLocation_put_hash(IHTMLLocation *iface, BSTR v) memcpy(hash + 1, v, size - sizeof(WCHAR)); } - hres = navigate_url(get_window(This), hash, get_uri(This), BINDING_NAVIGATED); + hres = navigate_url(This->window, hash, get_uri(This), BINDING_NAVIGATED); if(hash != v) free(hash); @@ -544,12 +553,12 @@ static HRESULT WINAPI HTMLLocation_reload(IHTMLLocation *iface, VARIANT_BOOL fla TRACE("(%p)->(%x)\n", This, flag); /* reload is supposed to fail if called from a script with different origin, but IE doesn't care */ - if(!is_main_content_window(get_window(This))) { + if(!is_main_content_window(This->window)) { FIXME("Unsupported on iframe\n"); return E_NOTIMPL; } - return reload_page(get_window(This)); + return reload_page(This->window); } static HRESULT WINAPI HTMLLocation_replace(IHTMLLocation *iface, BSTR bstr) @@ -558,7 +567,7 @@ static HRESULT WINAPI HTMLLocation_replace(IHTMLLocation *iface, BSTR bstr) TRACE("(%p)->(%s)\n", This, debugstr_w(bstr)); - return navigate_url(get_window(This), bstr, get_uri(This), BINDING_NAVIGATED | BINDING_REPLACE); + return navigate_url(This->window, bstr, get_uri(This), BINDING_NAVIGATED | BINDING_REPLACE); } static HRESULT WINAPI HTMLLocation_assign(IHTMLLocation *iface, BSTR bstr) @@ -618,10 +627,21 @@ static dispex_static_data_t HTMLLocation_dispex = { HTMLLocation_iface_tids }; -void HTMLLocation_Init(HTMLLocation *location) +HRESULT create_location(HTMLOuterWindow *window, HTMLLocation **ret) { + HTMLLocation *location; + + if(!(location = calloc(1, sizeof(*location)))) + return E_OUTOFMEMORY; + location->IHTMLLocation_iface.lpVtbl = &HTMLLocationVtbl; + location->ref = 1; + location->window = window; + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); init_dispatch(&location->dispex, (IUnknown*)&location->IHTMLLocation_iface, &HTMLLocation_dispex, COMPAT_MODE_QUIRKS); + + *ret = location; + return S_OK; } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index c1a258651cf..7c40ca83188 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -62,13 +62,17 @@ HTMLOuterWindow *mozwindow_to_window(const mozIDOMWindowProxy *mozwindow) return entry ? WINE_RB_ENTRY_VALUE(entry, HTMLOuterWindow, entry) : NULL; } -static void get_location(HTMLOuterWindow *This, HTMLLocation **ret) +static HRESULT get_location(HTMLOuterWindow *This, HTMLLocation **ret) { - if(!This->location.dispex.outer) - HTMLLocation_Init(&This->location); + if(!This->location) { + HRESULT hres = create_location(This, &This->location); + if(FAILED(hres)) + return hres; + } - IHTMLLocation_AddRef(&This->location.IHTMLLocation_iface); - *ret = &This->location; + IHTMLLocation_AddRef(&This->location->IHTMLLocation_iface); + *ret = This->location; + return S_OK; } void get_top_window(HTMLOuterWindow *window, HTMLOuterWindow **ret) @@ -122,8 +126,8 @@ static void detach_inner_window(HTMLInnerWindow *window) if(doc) detach_document_node(doc); - if(outer_window && outer_window->location.dispex.outer) - dispex_props_unlink(&outer_window->location.dispex); + if(outer_window && outer_window->location) + dispex_props_unlink(&outer_window->location->dispex); abort_window_bindings(window); remove_target_tasks(window->task_magic); @@ -283,8 +287,8 @@ static void release_outer_window(HTMLOuterWindow *This) if(This->base.inner_window) detach_inner_window(This->base.inner_window); - if(This->location.dispex.outer) - release_dispex(&This->location.dispex); + if(This->location) + IHTMLLocation_Release(&This->location->IHTMLLocation_iface); if(This->frame_element) This->frame_element->content_window = NULL; @@ -779,10 +783,14 @@ static HRESULT WINAPI HTMLWindow2_get_location(IHTMLWindow2 *iface, IHTMLLocatio { HTMLWindow *This = impl_from_IHTMLWindow2(iface); HTMLLocation *location; + HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - get_location(This->outer_window, &location); + hres = get_location(This->outer_window, &location); + if(FAILED(hres)) + return hres; + *p = &location->IHTMLLocation_iface; return S_OK; } @@ -4080,7 +4088,9 @@ static HRESULT IHTMLWindow2_location_hook(DispatchEx *dispex, WORD flags, DISPPA TRACE("forwarding to location.href\n"); - get_location(This->base.outer_window, &location); + hres = get_location(This->base.outer_window, &location); + if(FAILED(hres)) + return hres; hres = IDispatchEx_InvokeEx(&location->dispex.IDispatchEx_iface, DISPID_VALUE, 0, flags, dp, res, ei, caller); IHTMLLocation_Release(&location->IHTMLLocation_iface); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5d117d70e29..757bc0feb79 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -521,6 +521,10 @@ typedef struct { struct HTMLLocation { DispatchEx dispex; IHTMLLocation IHTMLLocation_iface; + + LONG ref; + + HTMLOuterWindow *window; }; typedef struct { @@ -599,7 +603,7 @@ struct HTMLOuterWindow { BOOL readystate_pending; HTMLInnerWindow *pending_window; - HTMLLocation location; + HTMLLocation *location; IMoniker *mon; IUri *uri; IUri *uri_nofrag; @@ -1013,7 +1017,7 @@ void get_top_window(HTMLOuterWindow*,HTMLOuterWindow**); HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow*,HTMLOptionElementFactory**); HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow*,HTMLImageElementFactory**); HRESULT HTMLXMLHttpRequestFactory_Create(HTMLInnerWindow*,HTMLXMLHttpRequestFactory**); -void HTMLLocation_Init(HTMLLocation*); +HRESULT create_location(HTMLOuterWindow*,HTMLLocation**); HRESULT create_navigator(compat_mode_t,IOmNavigator**); HRESULT create_html_screen(compat_mode_t,IHTMLScreen**); HRESULT create_performance(HTMLInnerWindow*,IHTMLPerformance**);

1 0

Paul Gofman : dinput: Unregister raw input on foreground loss.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: wine Branch: master Commit: 546f823ed17f6c28a7e32a5c66918557eba19ca4 URL: https://gitlab.winehq.org/wine/wine/-/commit/546f823ed17f6c28a7e32a5c669185… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Aug 29 19:54:02 2023 -0600 dinput: Unregister raw input on foreground loss. --- dlls/dinput/dinput_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index e14b023c4cc..f99ebbc2404 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -320,13 +320,13 @@ static LRESULT WINAPI di_em_win_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR case NOTIFY_THREAD_STOP: state->running = FALSE; break; + case NOTIFY_FOREGROUND_LOST: + handle_foreground_lost( (HWND)lparam ); + /* fallthrough */ case NOTIFY_REFRESH_DEVICES: while (state->devices_count--) dinput_device_internal_release( state->devices[state->devices_count] ); input_thread_update_device_list( state ); break; - case NOTIFY_FOREGROUND_LOST: - handle_foreground_lost( (HWND)lparam ); - break; } return 0;

1 0

Biswapriyo Nath : include: Add Windows.Media.Render.AudioRenderCategory enumeration.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: wine Branch: master Commit: 64dd6d2883bf87b141b2e4c657ecb293790c3f7a URL: https://gitlab.winehq.org/wine/wine/-/commit/64dd6d2883bf87b141b2e4c657ecb2… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Aug 31 10:09:39 2023 +0530 include: Add Windows.Media.Render.AudioRenderCategory enumeration. Required for Windows.Media.Effects.IAudioEffectsManagerStatics interface. --- include/Makefile.in | 1 + include/windows.media.render.idl | 52 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 507686917a3..a144a95a0e6 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -843,6 +843,7 @@ SOURCES = \ windows.media.closedcaptioning.idl \ windows.media.devices.idl \ windows.media.idl \ + windows.media.render.idl \ windows.media.speechrecognition.idl \ windows.media.speechsynthesis.idl \ windows.networking.connectivity.idl \ diff --git a/include/windows.media.render.idl b/include/windows.media.render.idl new file mode 100644 index 00000000000..cb6a47b8c8c --- /dev/null +++ b/include/windows.media.render.idl @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2023 Biswapriyo Nath + * + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "windows.foundation.idl"; + +namespace Windows.Media.Render { + typedef enum AudioRenderCategory AudioRenderCategory; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum AudioRenderCategory + { + Other = 0, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + ForegroundOnlyMedia = 1, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + BackgroundCapableMedia = 2, + Communications = 3, + Alerts = 4, + SoundEffects = 5, + GameEffects = 6, + GameMedia = 7, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + GameChat = 8, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + Speech = 9, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + Movie = 10, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + Media = 11, + }; +}

1 0

Brendan Shanks : kerberos: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: wine Branch: master Commit: a144c0899fb6a1852b74cb541b535ecdd3edf9a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/a144c0899fb6a1852b74cb541b535e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Aug 30 11:19:22 2023 -0700 kerberos: Ensure unixlib function tables and enum stay in sync. --- dlls/kerberos/unixlib.c | 8 ++++++-- dlls/kerberos/unixlib.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index c81c8a220ea..5bc1f72981f 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -1072,7 +1072,7 @@ static NTSTATUS process_attach( void *args ) return STATUS_DLL_NOT_FOUND; } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { process_attach, accept_context, @@ -1088,6 +1088,8 @@ unixlib_entry_t __wine_unix_call_funcs[] = verify_signature, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -1392,7 +1394,7 @@ static NTSTATUS wow64_verify_signature( void *args ) return verify_signature( &params ); } -unixlib_entry_t __wine_unix_call_wow64_funcs[] = +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = { process_attach, wow64_accept_context, @@ -1408,6 +1410,8 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_verify_signature, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + #endif /* _WIN64 */ #endif /* defined(SONAME_LIBKRB5) && defined(SONAME_LIBGSSAPI_KRB5) */ diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index fa83e2187f0..fcc0da308c5 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -137,6 +137,7 @@ enum unix_funcs unix_seal_message, unix_unseal_message, unix_verify_signature, + unix_funcs_count, }; #define KRB5_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )

1 0

Giovanni Mascellani : ci: Execute the tests.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: vkd3d Branch: master Commit: 229a34b93cf41ed63b03d105c0d7f831da0adf98 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/229a34b93cf41ed63b03d105c0d7f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Aug 29 22:55:56 2023 +0200 ci: Execute the tests. --- gitlab/build-linux | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab/build-linux b/gitlab/build-linux index 1b7a7a5b..4162442d 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -11,9 +11,9 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -../configure --enable-demos && make -j$(nproc) && make -j$(nproc) crosstest || touch ../pipeline_failed +../configure --enable-demos && make -j$(nproc) && make -j$(nproc) crosstest && make -j$(nproc) check || touch ../pipeline_failed mkdir -p ../artifacts/$COMMIT -rsync -Rr doc/* tests/*.exe ../artifacts/$COMMIT +rsync -Rr doc/* tests/*.exe test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT git reset --hard

1 0

Giovanni Mascellani : ci: Briefly document the CI setup.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: vkd3d Branch: master Commit: 367cf10cdcd5260c7c4991eae541d9e2cd53aaa9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/367cf10cdcd5260c7c4991eae541d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Aug 30 22:09:39 2023 +0200 ci: Briefly document the CI setup. --- README | 11 +++++++++++ gitlab/README | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/README b/README index 155f7de2..29f907de 100644 --- a/README +++ b/README @@ -82,3 +82,14 @@ commas or semicolons. conditions in tests. * VKD3D_TEST_BUG - set to 0 to disable bug_if() conditions in tests. + +================ +Developing vkd3d +================ + +Development of vkd3d happens on the Wine GitLab instance +(https://gitlab.winehq.org/wine/vkd3d/). Contributors are encouraged +to submit their patches using the merge request tool. + +Each merge request is automatically tested with the GitLab CI +system. See gitlab/README in the Git tree for more details. diff --git a/gitlab/README b/gitlab/README new file mode 100644 index 00000000..b04a3c8f --- /dev/null +++ b/gitlab/README @@ -0,0 +1,42 @@ +===================== +vkd3d testing scripts +===================== + +These scripts are used by the GitLab CI feature to automatically run +the vkd3d tests on each merge request. + +The CI target build-image, in the file image.yml, builds a Docker +image based on Debian bookworm with all the packages required for +testing, and uploads it to the GitLab container registry. The Docker +script is in the file image.docker. + +The file build.yml contains the actual testing targets. Currently +vkd3d is tested on Linux x86-64, with two different Vulkan drivers +(both from Mesa): llvmpipe (a software implementation) and RADV (a +hardware implementation backed by an AMD GPU). The testing logs are +available as CI artifacts. + +Some custom runner configuration is required in order to run the tests +on an AMD GPU. Specifically, a runner tagged with `amd-gpu' must be +available with the following features: + + * of course a sufficiently recent AMD GPU must be available to the + host; + + * the host kernel must have the appropriate driver and firmware + installed; + + * the runner must forward the DRI nodes to the guest; this can be + configured by adding the line + + devices = ["/dev/dri"] + + to the relevant [runners.docker] section in the config.toml file; + + * the DRI render nodes must be readable and writable by GID 800, + either because they belong to that group (e.g. because the group + `render', which typically owns those files, has GID 800) or via a + FS ACL; such stipulation is needed because in Debian group `render' + is created dynamically, therefore has no predictable GID: the use + of a fixed GID enables the guest system to be set up so that the + user running the tests can access the render nodes.

1 0

Giovanni Mascellani : ci: Execute CI also an a runner with an AMD GPU.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: vkd3d Branch: master Commit: 52d52ad1b95b9e95397ea97a34edad4e41847cec URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/52d52ad1b95b9e95397ea97a34eda… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Aug 29 22:59:50 2023 +0200 ci: Execute CI also an a runner with an AMD GPU. In order for this to work it is expected that the Docker host exposes the devices in /dev/dri to the guest system, and that the render nodes have GID 800 (usually that would be the "render" group, but the GID for that group is dynamically assigned, so we explicitly agree on a fixed number). --- gitlab/build.yml | 12 +++++++++++- gitlab/image.docker | 3 ++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gitlab/build.yml b/gitlab/build.yml index 49e69d57..c10d64a6 100644 --- a/gitlab/build.yml +++ b/gitlab/build.yml @@ -25,5 +25,15 @@ paths: - artifacts -build: +build-radv: extends: .build + tags: + - amd-gpu + variables: + VK_LOADER_DRIVERS_SELECT: 'radeon_*' + +build-llvmpipe: + extends: .build + allow_failure: true + variables: + VK_LOADER_DRIVERS_SELECT: 'lvp_*' diff --git a/gitlab/image.docker b/gitlab/image.docker index afc0dd1b..dd6923cb 100644 --- a/gitlab/image.docker +++ b/gitlab/image.docker @@ -35,6 +35,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ cd ../.. && \ rm -rf wine && \ apt-get clean && \ - useradd -m gitlab + groupadd host-render -g 800 && \ + useradd -m gitlab -G host-render USER gitlab

1 0

Francois Gouget : testbot/cgi: Align the textarea width with the text field size.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: tools Branch: master Commit: 61478328774b2cb053fd168d2c117159f314d029 URL: https://gitlab.winehq.org/winehq/tools/-/commit/61478328774b2cb053fd168d2c1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 4 12:21:50 2023 +0200 testbot/cgi: Align the textarea width with the text field size. The TestBot uses a 50 character width for the regular text fields so use the same width for textarea fields. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index d6ded1b0..d35304ac 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -409,7 +409,7 @@ sub GenerateValueInput($$$$) else { my $Size=$PropertyDescriptor->GetMaxLength(); - $Size=45 if ($Size > 45); + $Size = 50 if ($Size > 50); print "<input type='$InputType' name='", $PropertyDescriptor->GetName(), "' maxlength='", $PropertyDescriptor->GetMaxLength(), "' size='$Size'";

1 0

Francois Gouget : winetest/build-patterns: Show a count of failure modes and test-related bugs.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: tools Branch: master Commit: 8ef2ef2a23be218b6f9ddd18bb201e5c4012c71a URL: https://gitlab.winehq.org/winehq/tools/-/commit/8ef2ef2a23be218b6f9ddd18bb2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 1 12:36:41 2023 +0200 winetest/build-patterns: Show a count of failure modes and test-related bugs. --- winetest/build-patterns | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/winetest/build-patterns b/winetest/build-patterns index d541d5a2..78425ecd 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1502,6 +1502,18 @@ EOF $tests{0}->{desc} .= "</ul>"; if (!$nolist) { + my (%failure_bugs, %all_bugs); + foreach my $test (values %tests) + { + foreach my $bug (@{$test->{bugs}}) + { + $all_bugs{$bug->{id}} = 1; + next if ($bug->{desc} =~ /(?:invalid (?:read|write)|leak|uninitialized|use after free|valgrind)/); + $failure_bugs{$bug->{id}} = 1; + } + } + $tests{0}->{desc} .= "<p>For a total of <a title='This does not count bugs for failures in the \"old\" list and potential memory issues (Valgrind)'>roughly <b>". scalar(%failure_bugs) ." failure modes</b></a> (out of ". scalar(%all_bugs) ." test related bugs).\n"; + my @table = ("<details><summary>Page customization</summary> <div class='detailsbox'><p>This section lets you select the reports to show on this page.</p><p> <label><input id='reruns' type='checkbox' checked> Hide WineTest reruns</label><br>");

1 0

Francois Gouget : testbot/web: Don't put a link on the known failure messages.
by Alexandre Julliard Aug. 31, 2023

Aug. 31, 2023

Module: tools Branch: master Commit: 4798152ccf2b25ea77bc9bcb9dc218fadfec8b6e URL: https://gitlab.winehq.org/winehq/tools/-/commit/4798152ccf2b25ea77bc9bcb9dc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 20 14:56:03 2023 +0200 testbot/web: Don't put a link on the known failure messages. The link gets in the way of copy/pasting the failure message and having it on the bug id is sufficient. --- testbot/web/JobDetails.pl | 3 --- 1 file changed, 3 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 008595f3..72d4cd3f 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -538,7 +538,6 @@ sub GenerateFullLog($$$$$) if ($ErrFailures{$LineNo}) { print "[", $self->GetFailureLinks($ErrFailures{$LineNo}), "] "; - $Html = $self->GetFailureLink($ErrFailures{$LineNo}->[0], $Html); } print "$Html\n"; } @@ -575,7 +574,6 @@ sub GenerateFullLog($$$$$) if ($Group->{Failures}->{$MsgIndex}) { print "[", $self->GetFailureLinks($Group->{Failures}->{$MsgIndex}), "] "; - $Html = $self->GetFailureLink($Group->{Failures}->{$MsgIndex}->[0], $Html); } print "<span class='log-$Category'>$Html</span>\n"; } @@ -752,7 +750,6 @@ EOF if ($FailureIds) { print "[", $self->GetFailureLinks($FailureIds), "] "; - $Html = $self->GetFailureLink($FailureIds->[0], $Html); } print "$Html\n"; $MsgIndex++;

1 0