September 2022 - Wine-Commits

Rémi Bernon : mf/tests: Dump image samples with a BMP header and RGB data.
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: wine Branch: master Commit: 2c7fdd25e05850d18ebe04888cfef26efbc86233 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c7fdd25e05850d18ebe04888cfef2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 19 12:40:43 2022 +0200 mf/tests: Dump image samples with a BMP header and RGB data. Allowing easier preview of NV12 / I420 images as well. --- dlls/mf/tests/i420frame.bmp | Bin 13824 -> 50742 bytes dlls/mf/tests/nv12frame.bmp | Bin 13824 -> 50742 bytes dlls/mf/tests/rgb32frame-vp.bmp | Bin 36864 -> 36918 bytes dlls/mf/tests/rgb32frame.bmp | Bin 36864 -> 36918 bytes dlls/mf/tests/transform.c | 146 ++++++++++++++++++++++++++++++++++------ 5 files changed, 127 insertions(+), 19 deletions(-)

1 0

Rémi Bernon : mf/tests: Rename transform frame dumps to BMP.
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: wine Branch: master Commit: 0402d5b5a80f3f34d851c9786ddbe670c0971c76 URL: https://gitlab.winehq.org/wine/wine/-/commit/0402d5b5a80f3f34d851c9786ddbe6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 19 12:38:32 2022 +0200 mf/tests: Rename transform frame dumps to BMP. --- dlls/mf/tests/{i420frame.bin => i420frame.bmp} | 0 dlls/mf/tests/{nv12frame.bin => nv12frame.bmp} | 0 dlls/mf/tests/resource.rc | 16 ++++++++-------- dlls/mf/tests/{rgb32frame-vp.bin => rgb32frame-vp.bmp} | Bin dlls/mf/tests/{rgb32frame.bin => rgb32frame.bmp} | Bin dlls/mf/tests/transform.c | 12 ++++++------ 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/mf/tests/i420frame.bin b/dlls/mf/tests/i420frame.bmp similarity index 100% rename from dlls/mf/tests/i420frame.bin rename to dlls/mf/tests/i420frame.bmp diff --git a/dlls/mf/tests/nv12frame.bin b/dlls/mf/tests/nv12frame.bmp similarity index 100% rename from dlls/mf/tests/nv12frame.bin rename to dlls/mf/tests/nv12frame.bmp diff --git a/dlls/mf/tests/resource.rc b/dlls/mf/tests/resource.rc index 3cc0f875452..43493319046 100644 --- a/dlls/mf/tests/resource.rc +++ b/dlls/mf/tests/resource.rc @@ -55,17 +55,17 @@ mp3decdata.bin RCDATA mp3decdata.bin h264data.bin RCDATA h264data.bin /* Generated from running the tests on Windows */ -/* @makedep: nv12frame.bin */ -nv12frame.bin RCDATA nv12frame.bin +/* @makedep: nv12frame.bmp */ +nv12frame.bmp RCDATA nv12frame.bmp /* Generated from running the tests on Windows */ -/* @makedep: i420frame.bin */ -i420frame.bin RCDATA i420frame.bin +/* @makedep: i420frame.bmp */ +i420frame.bmp RCDATA i420frame.bmp /* Generated from running the tests on Windows */ -/* @makedep: rgb32frame.bin */ -rgb32frame.bin RCDATA rgb32frame.bin +/* @makedep: rgb32frame.bmp */ +rgb32frame.bmp RCDATA rgb32frame.bmp /* Generated from running the tests on Windows */ -/* @makedep: rgb32frame-vp.bin */ -rgb32frame-vp.bin RCDATA rgb32frame-vp.bin +/* @makedep: rgb32frame-vp.bmp */ +rgb32frame-vp.bmp RCDATA rgb32frame-vp.bmp diff --git a/dlls/mf/tests/rgb32frame-vp.bin b/dlls/mf/tests/rgb32frame-vp.bmp similarity index 100% rename from dlls/mf/tests/rgb32frame-vp.bin rename to dlls/mf/tests/rgb32frame-vp.bmp diff --git a/dlls/mf/tests/rgb32frame.bin b/dlls/mf/tests/rgb32frame.bmp similarity index 100% rename from dlls/mf/tests/rgb32frame.bin rename to dlls/mf/tests/rgb32frame.bmp diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index dc1d8bd189a..4e42c39c16f 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -2834,7 +2834,7 @@ static void test_h264_decoder(void) ref = IMFSample_Release(output_sample); ok(ref == 1, "Release returned %ld\n", ref); - ret = check_mf_sample_collection(output_samples, &output_sample_desc_nv12, L"nv12frame.bin"); + ret = check_mf_sample_collection(output_samples, &output_sample_desc_nv12, L"nv12frame.bmp"); ok(ret == 0, "got %lu%% diff\n", ret); IMFCollection_Release(output_samples); @@ -2897,7 +2897,7 @@ static void test_h264_decoder(void) ref = IMFSample_Release(output_sample); ok(ref == 1, "Release returned %ld\n", ref); - ret = check_mf_sample_collection(output_samples, &expect_output_sample_i420, L"i420frame.bin"); + ret = check_mf_sample_collection(output_samples, &expect_output_sample_i420, L"i420frame.bmp"); ok(ret == 0, "got %lu%% diff\n", ret); IMFCollection_Release(output_samples); @@ -3550,7 +3550,7 @@ static void test_color_convert(void) ok(output_info.cbSize == actual_width * actual_height * 4, "got cbSize %#lx\n", output_info.cbSize); ok(output_info.cbAlignment == 1, "got cbAlignment %#lx\n", output_info.cbAlignment); - load_resource(L"nv12frame.bin", &nv12frame_data, &nv12frame_data_len); + load_resource(L"nv12frame.bmp", &nv12frame_data, &nv12frame_data_len); ok(nv12frame_data_len == 13824, "got length %lu\n", nv12frame_data_len); input_sample = create_sample(nv12frame_data, nv12frame_data_len); @@ -3579,7 +3579,7 @@ static void test_color_convert(void) ref = IMFSample_Release(output_sample); ok(ref == 1, "Release returned %ld\n", ref); - ret = check_mf_sample_collection(output_samples, &output_sample_desc, L"rgb32frame.bin"); + ret = check_mf_sample_collection(output_samples, &output_sample_desc, L"rgb32frame.bmp"); ok(ret <= 4 /* small and harmless diff in Wine vs Windows */, "got %lu%% diff\n", ret); IMFCollection_Release(output_samples); @@ -4217,7 +4217,7 @@ todo_wine { ok(output_info.cbSize == actual_width * actual_height * 4, "got cbSize %#lx\n", output_info.cbSize); ok(output_info.cbAlignment == 0, "got cbAlignment %#lx\n", output_info.cbAlignment); - load_resource(L"nv12frame.bin", &nv12frame_data, &nv12frame_data_len); + load_resource(L"nv12frame.bmp", &nv12frame_data, &nv12frame_data_len); ok(nv12frame_data_len == 13824, "got length %lu\n", nv12frame_data_len); input_sample = create_sample(nv12frame_data, nv12frame_data_len); @@ -4252,7 +4252,7 @@ todo_wine { ref = IMFSample_Release(output_sample); ok(ref == 1, "Release returned %ld\n", ref); - ret = check_mf_sample_collection(output_samples, &output_sample_desc, L"rgb32frame-vp.bin"); + ret = check_mf_sample_collection(output_samples, &output_sample_desc, L"rgb32frame-vp.bmp"); todo_wine ok(ret == 0 || broken(ret == 25) /* w1064v1507 / w1064v1809 incorrectly rescale */, "got %lu%% diff\n", ret); IMFCollection_Release(output_samples);

1 0

Rémi Bernon : mf/tests: Check all produced output IMFSample at the same time.
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: wine Branch: master Commit: ec556ff54b5e783bf590871c3fa7d83d588cfeb9 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec556ff54b5e783bf590871c3fa7d8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 19 12:37:11 2022 +0200 mf/tests: Check all produced output IMFSample at the same time. Keeping them in a IMFCollection. --- dlls/mf/tests/transform.c | 511 ++++++++++++++++++++-------------------------- 1 file changed, 221 insertions(+), 290 deletions(-)

1 0

Rémi Bernon : mf/tests: Factor IMFSample attributes checks in check_mf_sample.
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: wine Branch: master Commit: 05d6bfb311c5b17c63517deb3e88b32b1886179e URL: https://gitlab.winehq.org/wine/wine/-/commit/05d6bfb311c5b17c63517deb3e88b3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Sep 18 21:22:40 2022 +0200 mf/tests: Factor IMFSample attributes checks in check_mf_sample. --- dlls/mf/tests/transform.c | 311 ++++++++++++++++++++++++---------------------- 1 file changed, 161 insertions(+), 150 deletions(-)

1 0

Rémi Bernon : mf/tests: Factor IMFSample checks in a check_mf_sample helper.
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: wine Branch: master Commit: 62ae3bcfe341c1af28647e432fe7cdd3f4c56cd8 URL: https://gitlab.winehq.org/wine/wine/-/commit/62ae3bcfe341c1af28647e432fe7cd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Sep 18 20:45:37 2022 +0200 mf/tests: Factor IMFSample checks in a check_mf_sample helper. --- dlls/mf/tests/transform.c | 512 +++++++++++++++++++++++----------------------- 1 file changed, 251 insertions(+), 261 deletions(-)

1 0

Rémi Bernon : mf/tests: Factor IMFTransform_ProcessOutput checks together.
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: wine Branch: master Commit: 8381bcb580863dfad292b970d03c6ad9815bdee9 URL: https://gitlab.winehq.org/wine/wine/-/commit/8381bcb580863dfad292b970d03c6a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 17 21:51:04 2022 +0200 mf/tests: Factor IMFTransform_ProcessOutput checks together. --- dlls/mf/tests/transform.c | 433 ++++++++++++++++------------------------------ 1 file changed, 148 insertions(+), 285 deletions(-)

1 0

Rémi Bernon : mf/tests: Introduce a new load_resource helper.
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: wine Branch: master Commit: d27f2db7d55e2627c89967ed8430fc700a63a952 URL: https://gitlab.winehq.org/wine/wine/-/commit/d27f2db7d55e2627c89967ed8430fc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Sep 18 19:21:20 2022 +0200 mf/tests: Introduce a new load_resource helper. --- dlls/mf/tests/transform.c | 90 ++++++++++++----------------------------------- 1 file changed, 23 insertions(+), 67 deletions(-)

1 0

Rémi Bernon : mf/tests: Introduce a new dump_mf_sample helper.
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: wine Branch: master Commit: d0478f69c31f64c7ec20006aac5bdf7a640487c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d0478f69c31f64c7ec20006aac5bdf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Sep 18 19:05:04 2022 +0200 mf/tests: Introduce a new dump_mf_sample helper. --- dlls/mf/tests/transform.c | 229 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 202 insertions(+), 27 deletions(-)

1 0

Rémi Bernon : mf/tests: Use separate variables for input / output samples.
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: wine Branch: master Commit: 27adb7aa282036c9e9c3774cafcb333895c29a69 URL: https://gitlab.winehq.org/wine/wine/-/commit/27adb7aa282036c9e9c3774cafcb33… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 17 17:36:56 2022 +0200 mf/tests: Use separate variables for input / output samples. --- dlls/mf/tests/transform.c | 469 +++++++++++++++++++++++----------------------- 1 file changed, 230 insertions(+), 239 deletions(-)

1 0

Francois Gouget : testbot/LibvirtTool: Disable the Windows time service.
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: tools Branch: master Commit: 05e5686eb1ccf95f92de00d93804ae5fdbccb346 URL: https://gitlab.winehq.org/winehq/tools/-/commit/05e5686eb1ccf95f92de00d9380… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 19 17:26:33 2022 +0200 testbot/LibvirtTool: Disable the Windows time service. The TestBot already sets the VM's current time before starting a task. But the Windows Time service could still be making small time adjustmenents (including backwards) by small (<1s) amounts while the tests are running, which could cause failures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53516 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53273 --- testbot/bin/LibvirtTool.pl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index d087b358..0c070da6 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -716,6 +716,21 @@ sub CreateSnapshot($$$$) Error("Could not change the Windows boot delay on $VMKey\n"); } + # Stop and disable the Windows time service to be sure it won't change + # the time while a test is running. + if (RunAndWait($PTA, ["net.exe", "stop", "w32time"])) + { + Error("Could not stop the $VMKey Windows time service\n"); + } + if (RunAndWait($PTA, ["sc.exe", "config", "w32time", "start=", "disabled"])) + { + Error("Could not disable the $VMKey Windows time service\n"); + } + if (RunAndWait($TA, ["reg.exe", "add", "HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Services\\W32Time\\Parameters", "/v", "Type", "/t", "REG_SZ", "/d", "NoSync", "/f"])) + { + FatalError("Could not set the $VMKey Windows Time service to NoSync\n"); + } + if ($Config->{tsign}) { # Takes effect after the next reboot

1 0