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

Gabriel Ivăncescu : mshtml: Implement Cycle Collection for HTMLLocation.
by Alexandre Julliard 31 Aug '23

31 Aug '23

Module: wine Branch: master Commit: 81324e4032bd68d3cd18e8e2406a214dbab56311 URL: https://gitlab.winehq.org/wine/wine/-/commit/81324e4032bd68d3cd18e8e2406a21… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Aug 30 16:05:13 2023 +0300 mshtml: Implement Cycle Collection for HTMLLocation. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmllocation.c | 49 ++++++++++++++++++++++++++++++++++---------- dlls/mshtml/mshtml_private.h | 2 -- 2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 35446c57bd3..5941c383db4 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -73,7 +73,7 @@ static HRESULT WINAPI HTMLLocation_QueryInterface(IHTMLLocation *iface, REFIID r *ppv = NULL; FIXME("(%p)->(IID_IMarshal %p)\n", This, ppv); return E_NOINTERFACE; - }else if(dispex_query_interface_no_cc(&This->dispex, riid, ppv)) { + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { *ppv = NULL; @@ -88,7 +88,7 @@ static HRESULT WINAPI HTMLLocation_QueryInterface(IHTMLLocation *iface, REFIID r static ULONG WINAPI HTMLLocation_AddRef(IHTMLLocation *iface) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - LONG ref = InterlockedIncrement(&This->ref); + LONG ref = dispex_ref_incr(&This->dispex); TRACE("(%p) ref=%ld\n", This, ref); @@ -98,16 +98,10 @@ static ULONG WINAPI HTMLLocation_AddRef(IHTMLLocation *iface) static ULONG WINAPI HTMLLocation_Release(IHTMLLocation *iface) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - LONG ref = InterlockedDecrement(&This->ref); + LONG ref = dispex_ref_decr(&This->dispex); TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { - IHTMLWindow2_Release(&This->window->base.IHTMLWindow2_iface); - release_dispex(&This->dispex); - free(This); - } - return ref; } @@ -616,13 +610,47 @@ static const IHTMLLocationVtbl HTMLLocationVtbl = { HTMLLocation_toString }; +static inline HTMLLocation *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLLocation, dispex); +} + +static void HTMLLocation_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLLocation *This = impl_from_DispatchEx(dispex); + if(This->window) + note_cc_edge((nsISupports*)&This->window->base.IHTMLWindow2_iface, "window", cb); +} + +static void HTMLLocation_unlink(DispatchEx *dispex) +{ + HTMLLocation *This = impl_from_DispatchEx(dispex); + if(This->window) { + HTMLOuterWindow *window = This->window; + This->window = NULL; + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + } +} + +static void HTMLLocation_destructor(DispatchEx *dispex) +{ + HTMLLocation *This = impl_from_DispatchEx(dispex); + free(This); +} + +static const dispex_static_data_vtbl_t HTMLLocation_dispex_vtbl = { + .destructor = HTMLLocation_destructor, + .traverse = HTMLLocation_traverse, + .unlink = HTMLLocation_unlink +}; + static const tid_t HTMLLocation_iface_tids[] = { IHTMLLocation_tid, 0 }; static dispex_static_data_t HTMLLocation_dispex = { "Location", - NULL, + &HTMLLocation_dispex_vtbl, DispHTMLLocation_tid, HTMLLocation_iface_tids }; @@ -635,7 +663,6 @@ HRESULT create_location(HTMLOuterWindow *window, HTMLLocation **ret) return E_OUTOFMEMORY; location->IHTMLLocation_iface.lpVtbl = &HTMLLocationVtbl; - location->ref = 1; location->window = window; IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 757bc0feb79..05203c53897 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -522,8 +522,6 @@ struct HTMLLocation { DispatchEx dispex; IHTMLLocation IHTMLLocation_iface; - LONG ref; - HTMLOuterWindow *window; };

1 0

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

31 Aug '23

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

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

31 Aug '23

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

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

31 Aug '23

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 CI also an a runner with an AMD GPU.
by Alexandre Julliard 31 Aug '23

31 Aug '23

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

Giovanni Mascellani : ci: Execute the tests.
by Alexandre Julliard 31 Aug '23

31 Aug '23

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 31 Aug '23

31 Aug '23

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

Francois Gouget : winetest: Remove the slack for Windows 11 test results.
by Alexandre Julliard 31 Aug '23

31 Aug '23

Module: tools Branch: master Commit: 59e08a5e20de6cf746da9744f4696d38610cbf88 URL: https://gitlab.winehq.org/winehq/tools/-/commit/59e08a5e20de6cf746da9744f46… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 20 15:04:10 2023 +0200 winetest: Remove the slack for Windows 11 test results. The Windows 11 results are good enough for the regular limit now. --- winetest/dissect | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 3d666ef5..a7eb27ab 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -415,8 +415,8 @@ foreach my $entry (@idmatch) last; } } -# Give a little slack to the latest Windows 10. -$maxfailedtests += 20 if ($version =~ /^w11/); +# Give a little slack to the latest Windows 11. +#$maxfailedtests += 20 if ($version =~ /^w11/); if ($prediluvian and not $acceptprediluvianwin) {

1 0

Francois Gouget : winetest: Give some slack to the macOS test results.
by Alexandre Julliard 31 Aug '23

31 Aug '23

Module: tools Branch: master Commit: d423d6c3bd221b16e2f85875590a4ada1793e713 URL: https://gitlab.winehq.org/winehq/tools/-/commit/d423d6c3bd221b16e2f85875590… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 2 14:33:57 2023 +0200 winetest: Give some slack to the macOS test results. Hopefully this will promote work on the macOS tests to bring them more in line with the other platforms. --- winetest/dissect | 2 ++ 1 file changed, 2 insertions(+) diff --git a/winetest/dissect b/winetest/dissect index a7eb27ab..d936762c 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -450,6 +450,8 @@ if ($wine_build) { chomp $merge_base; $merge_base eq $testbuild or mydie "wine build '$wine_build' not a descendant of build $testbuild"; } +# Give a little slack to the macOS results. +$maxfailedtests += 30 if ($version eq "mac"); #

1 0

Francois Gouget : testbot/LogUtils: Fix setting BadRef when failing to load a reference log.
by Alexandre Julliard 31 Aug '23

31 Aug '23

Module: tools Branch: master Commit: 3865d35915d861598df080bb552ef88b03020e1f URL: https://gitlab.winehq.org/winehq/tools/-/commit/3865d35915d861598df080bb552… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 23 18:19:36 2023 +0200 testbot/LogUtils: Fix setting BadRef when failing to load a reference log. The information goes on the log being analyzed, not on the preexisting reference log. --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e8f32f34..ae06baf2 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1378,7 +1378,7 @@ sub TagNewMessages($$) if (defined $RefInfo->{BadLog}) { # Only save the first BadLog error - $RefInfo->{BadRef} ||= $RefInfo->{BadLog}; + $LogInfo->{BadRef} ||= $RefInfo->{BadLog}; next; } $HasRef = 1;

1 0