October 2023 - Wine-commits

Rémi Bernon : dmime/tests: Remove flaky track playing state test.
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: 3e31e29d653c6593ea4d18558a6c1946f3d13eca URL: https://gitlab.winehq.org/wine/wine/-/commit/3e31e29d653c6593ea4d18558a6c19… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 23 22:49:46 2023 +0200 dmime/tests: Remove flaky track playing state test. This fails regularly on Win7. --- dlls/dmime/tests/dmime.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 6dc9d8e0f5e..151dbead3c1 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3971,11 +3971,6 @@ static void test_segment_state(void) ok(hr == S_OK, "got %#lx\n", hr); - /* This might be timing dependent and if PlaySegment is already - * late, the tracks are played synchronously and right away. - */ - todo_wine check_track_state(track, playing, FALSE); - ret = test_track_wait_playing(track, 50); ok(ret == 0, "got %#lx\n", ret);

1 0

Rémi Bernon : dmime/tests: Avoid checking message segment state reference count.
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: b971c55a3a180d77132cbfe4156de4928ce447c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/b971c55a3a180d77132cbfe4156de4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 25 14:19:31 2023 +0200 dmime/tests: Avoid checking message segment state reference count. --- dlls/dmime/tests/dmime.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 151dbead3c1..7ed6568ecd4 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -38,8 +38,8 @@ static ULONG get_refcount(void *iface) return IUnknown_Release(unknown); } -#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) -static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c, FALSE) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported, BOOL check_refs) { ULONG expect_ref = get_refcount(iface_ptr); IUnknown *iface = iface_ptr; @@ -52,10 +52,10 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO if (SUCCEEDED(hr)) { LONG ref = get_refcount(unk); - ok_(__FILE__, line)(ref == expect_ref + 1, "got %ld\n", ref); + if (check_refs) ok_(__FILE__, line)(ref == expect_ref + 1, "got %ld\n", ref); IUnknown_Release(unk); ref = get_refcount(iface_ptr); - ok_(__FILE__, line)(ref == expect_ref, "got %ld\n", ref); + if (check_refs) ok_(__FILE__, line)(ref == expect_ref, "got %ld\n", ref); } } @@ -3024,8 +3024,8 @@ static void check_dmus_notification_pmsg_(int line, DMUS_NOTIFICATION_PMSG *msg, ok_(__FILE__, line)(!msg->punkUser, "got punkUser %p\n", msg->punkUser); else { - check_interface_(line, msg->punkUser, &IID_IDirectMusicSegmentState, TRUE); - check_interface_(line, msg->punkUser, &IID_IDirectMusicSegmentState8, TRUE); + check_interface_(line, msg->punkUser, &IID_IDirectMusicSegmentState, TRUE, FALSE); + check_interface_(line, msg->punkUser, &IID_IDirectMusicSegmentState8, TRUE, FALSE); } }

1 0

Rémi Bernon : dmime/tests: Ignore failure on missing gm.dls in test_band_track_play.
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: bbdea3afc3ad3e92c67a05dac359b3f445cf39e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/bbdea3afc3ad3e92c67a05dac359b3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 23 22:53:41 2023 +0200 dmime/tests: Ignore failure on missing gm.dls in test_band_track_play. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55722 --- dlls/dmime/tests/dmime.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 7ed6568ecd4..85ea8fcfeff 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3722,7 +3722,10 @@ static void test_band_track_play(void) &IID_IDirectMusicLoader8, (void **)&loader); ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicLoader_SetObject(loader, &desc); - ok(hr == S_OK, "got %#lx\n", hr); + if (hr == DMUS_E_LOADER_FAILEDOPEN) + skip("Failed to open gm.dls, missing system SoundFont?\n"); + else + ok(hr == S_OK, "got %#lx\n", hr); hr = test_loader_stream_create(stream, loader, &loader_stream); ok(hr == S_OK, "got %#lx\n", hr);

1 0

Hans Leidekker : kernelbase: Trace global memory counters in decimal.
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: 3f6510c1d6b9bca6594f22693faed1a3b0fc80c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/3f6510c1d6b9bca6594f22693faed1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 20 16:00:19 2023 +0200 kernelbase: Trace global memory counters in decimal. --- dlls/kernelbase/memory.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 05d521da321..4f4bba9a13b 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -1247,12 +1247,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH GlobalMemoryStatusEx( MEMORYSTATUSEX *status ) if (status->ullTotalPhys) status->dwMemoryLoad = (status->ullTotalPhys - status->ullAvailPhys) / (status->ullTotalPhys / 100); - TRACE_(virtual)( "MemoryLoad %ld, TotalPhys %s, AvailPhys %s, TotalPageFile %s," - "AvailPageFile %s, TotalVirtual %s, AvailVirtual %s\n", - status->dwMemoryLoad, wine_dbgstr_longlong(status->ullTotalPhys), - wine_dbgstr_longlong(status->ullAvailPhys), wine_dbgstr_longlong(status->ullTotalPageFile), - wine_dbgstr_longlong(status->ullAvailPageFile), wine_dbgstr_longlong(status->ullTotalVirtual), - wine_dbgstr_longlong(status->ullAvailVirtual) ); + TRACE_(virtual)( "MemoryLoad %lu, TotalPhys %I64u, AvailPhys %I64u, TotalPageFile %I64u, " + "AvailPageFile %I64u, TotalVirtual %I64u, AvailVirtual %I64u\n", + status->dwMemoryLoad, status->ullTotalPhys, status->ullAvailPhys, status->ullTotalPageFile, + status->ullAvailPageFile, status->ullTotalVirtual, status->ullAvailVirtual ); cached_status = *status; return TRUE;

1 0

Zebediah Figura : include: Convert d3d10shader.h to an IDL.
by Alexandre Julliard 24 Oct '23

24 Oct '23

Module: wine Branch: master Commit: d78ca75c566679f6c03aa6a545e5b5216d797bb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d78ca75c566679f6c03aa6a545e5b5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 3 17:30:22 2023 -0500 include: Convert d3d10shader.h to an IDL. --- include/Makefile.in | 2 +- include/d3d10shader.h | 233 ------------------------------------------------ include/d3d10shader.idl | 217 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 218 insertions(+), 234 deletions(-)

1 0

Zebediah Figura : include: Convert d3d10effect.h to an IDL.
by Alexandre Julliard 24 Oct '23

24 Oct '23

Module: wine Branch: master Commit: b57d4fcd2172e5403653bde4f1010478c57d4415 URL: https://gitlab.winehq.org/wine/wine/-/commit/b57d4fcd2172e5403653bde4f10104… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 3 17:30:36 2023 -0500 include: Convert d3d10effect.h to an IDL. --- include/Makefile.in | 2 +- include/d3d10effect.h | 859 ------------------------------------------------ include/d3d10effect.idl | 512 +++++++++++++++++++++++++++++ 3 files changed, 513 insertions(+), 860 deletions(-)

1 0

Jinoh Kang : ntdll/tests: Use win_skip() for missing APIs in test_query_process_debug_port_custom_dacl.
by Alexandre Julliard 24 Oct '23

24 Oct '23

Module: wine Branch: master Commit: 4a7bba9087302102129daff4df987b2cc67f4917 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a7bba9087302102129daff4df987b… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Oct 21 20:30:28 2023 +0900 ntdll/tests: Use win_skip() for missing APIs in test_query_process_debug_port_custom_dacl. A missing API is a todo in Wine. --- dlls/ntdll/tests/info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 3b9bad56ea4..3cedca0d6ef 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2228,13 +2228,13 @@ static void test_query_process_debug_port_custom_dacl(int argc, char **argv) if (!pDbgUiSetThreadDebugObject) { - skip("DbgUiGetThreadDebugObject not found\n"); + win_skip("DbgUiGetThreadDebugObject not found\n"); return; } if (!pDbgUiGetThreadDebugObject) { - skip("DbgUiSetThreadDebugObject not found\n"); + win_skip("DbgUiSetThreadDebugObject not found\n"); return; }

1 0

Zebediah Figura : d3d10core/tests: Avoid POINT sampling exactly halfway between two mip levels.
by Alexandre Julliard 24 Oct '23

24 Oct '23

Module: wine Branch: master Commit: e50b5ce778052d29021ca17e192d7db947c0d36e URL: https://gitlab.winehq.org/wine/wine/-/commit/e50b5ce778052d29021ca17e192d7d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 23 20:41:53 2023 -0500 d3d10core/tests: Avoid POINT sampling exactly halfway between two mip levels. This gives different results on llvmpipe. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53213 --- dlls/d3d10core/tests/d3d10core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index b337c05f056..a8283da9c18 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -7448,10 +7448,10 @@ static void test_texture(void) {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, -1.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.4f, rgba_level_0}, - {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.5f, level_1_colors}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.6f, level_1_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.0f, level_1_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.4f, level_1_colors}, - {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.5f, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.6f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 2.0f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 3.0f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 4.0f, level_2_colors},

1 0

Zebediah Figura : d3d11/tests: Avoid POINT sampling exactly halfway between two mip levels.
by Alexandre Julliard 24 Oct '23

24 Oct '23

Module: wine Branch: master Commit: 552a46ea78cc8bedc3d012040bfc70ce8d6f4666 URL: https://gitlab.winehq.org/wine/wine/-/commit/552a46ea78cc8bedc3d012040bfc70… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 23 20:42:23 2023 -0500 d3d11/tests: Avoid POINT sampling exactly halfway between two mip levels. This gives different results on llvmpipe. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53213 --- dlls/d3d11/tests/d3d11.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3bf3fa44d97..1b33664befd 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9830,10 +9830,10 @@ static void test_texture(void) {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, -1.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.4f, rgba_level_0}, - {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.5f, level_1_colors}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.6f, level_1_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.0f, level_1_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.4f, level_1_colors}, - {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.5f, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.6f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 2.0f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 3.0f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 4.0f, level_2_colors},

1 0

Esme Povirk : mscoree: Update Wine Mono to 8.1.0.
by Alexandre Julliard 24 Oct '23

24 Oct '23

Module: wine Branch: master Commit: 9c1ffb545f350743e71cdfcc0dae5e98324d10ee URL: https://gitlab.winehq.org/wine/wine/-/commit/9c1ffb545f350743e71cdfcc0dae5e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Oct 23 10:06:17 2023 -0500 mscoree: Update Wine Mono to 8.1.0. --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- tools/gitlab/test.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index bcf92efdb80..a2957c3040a 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -56,10 +56,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "8.0.0" +#define MONO_VERSION "8.1.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "75b3f45dca1dc89857fe9e932da78710f64cc6d49ef1ab0c723a177085b4711b" +#define MONO_SHA "0ed3ec533aef79b2f312155931cf7b1080009ac0c5b4c2bcfeb678ac948e0810" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 50ed656a656..dcbb531770b 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "8.0.0" +#define WINE_MONO_VERSION "8.1.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index 0df6a6029f9..aaae5671843 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -7,7 +7,7 @@ variables: GIT_STRATEGY: none GECKO_VER: 2.47.4 - MONO_VER: 8.0.0 + MONO_VER: 8.1.0 cache: - key: wine-gecko-$GECKO_VER paths:

1 0