wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Rémi Bernon : mf/tests: Add some H264 decoder Process(Input|Output) tests.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: a419ff8b6fcb53abf258129c9647ecff1626b01c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a419ff8b6fcb53abf258129c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 22 16:47:21 2022 +0100 mf/tests: Add some H264 decoder Process(Input|Output) tests. The h264data.bin resource has been generated with: gst-launch-1.0 videotestsrc num-buffers=60 ! \ video/x-raw,format=I420,width=78,height=74,framerate=30000/1001 ! \ videoconvert ! x264enc ! filesink location=dlls/mf/tests/h264data.bin Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/h264data.bin | Bin 0 -> 49137 bytes dlls/mf/tests/mf.c | 95 ++++++++++++++++++++++++++++++++++++++++++++- dlls/mf/tests/resource.rc | 3 ++ 3 files changed, 97 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/h264data.bin b/dlls/mf/tests/h264data.bin new file mode 100644 index 00000000000..d014052ca49 Binary files /dev/null and b/dlls/mf/tests/h264data.bin differ diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 6dabae1deb0..e0793152d74 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6369,6 +6369,27 @@ failed: CoUninitialize(); } +#define next_h264_sample(a, b) next_h264_sample_(__LINE__, a, b) +static IMFSample *next_h264_sample_(int line, const BYTE **h264_buf, ULONG *h264_len) +{ + const BYTE *sample_data; + + ok_(__FILE__, line)(*h264_len > 4, "invalid h264 length\n"); + ok_(__FILE__, line)(*(UINT32 *)*h264_buf == 0x01000000, "invalid h264 buffer\n"); + sample_data = *h264_buf; + + (*h264_len) -= 4; + (*h264_buf) += 4; + + while (*h264_len >= 4 && *(UINT32 *)*h264_buf != 0x01000000) + { + (*h264_len)--; + (*h264_buf)++; + } + + return create_sample(sample_data, *h264_buf - sample_data); +} + static void test_h264_decoder(void) { static const media_type_desc transform_inputs[] = @@ -6534,10 +6555,16 @@ static void test_h264_decoder(void) MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_NV12}; MFT_OUTPUT_STREAM_INFO output_info; MFT_INPUT_STREAM_INFO input_info; + MFT_OUTPUT_DATA_BUFFER output; + const BYTE *h264_encoded_data; + ULONG h264_encoded_data_len; IMFMediaType *media_type; IMFTransform *transform; - ULONG flags, i, ret; + ULONG i, ret, flags; + IMFSample *sample; + HRSRC resource; GUID class_id; + DWORD status; HRESULT hr; hr = CoInitialize(NULL); @@ -6723,8 +6750,74 @@ static void test_h264_decoder(void) todo_wine ok(output_info.cbAlignment == 0, "got cbAlignment %#x\n", output_info.cbAlignment); + resource = FindResourceW(NULL, L"h264data.bin", (const WCHAR *)RT_RCDATA); + ok(resource != 0, "FindResourceW failed, error %u\n", GetLastError()); + h264_encoded_data = LockResource(LoadResource(GetModuleHandleW(NULL), resource)); + h264_encoded_data_len = SizeofResource(GetModuleHandleW(NULL), resource); + + /* As output_info.dwFlags doesn't have MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES + * IMFTransform_ProcessOutput needs a sample or returns an error */ + + status = 0; + memset(&output, 0, sizeof(output)); + hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); + todo_wine + ok(hr == E_INVALIDARG || hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr); + ok(output.dwStreamID == 0, "got dwStreamID %u\n", output.dwStreamID); + ok(!output.pSample, "got pSample %p\n", output.pSample); + ok(output.dwStatus == 0, "got dwStatus %#x\n", output.dwStatus); + ok(!output.pEvents, "got pEvents %p\n", output.pEvents); + ok(status == 0, "got status %#x\n", status); + + sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); + while (1) + { + status = 0; + memset(&output, 0, sizeof(output)); + output.pSample = create_sample(NULL, output_info.cbSize); + hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); + if (hr != MF_E_TRANSFORM_NEED_MORE_INPUT) break; + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr); + ok(output.dwStreamID == 0, "got dwStreamID %u\n", output.dwStreamID); + ok(!!output.pSample, "got pSample %p\n", output.pSample); + ok(output.dwStatus == 0, "got dwStatus %#x\n", output.dwStatus); + ok(!output.pEvents, "got pEvents %p\n", output.pEvents); + ok(status == 0, "got status %#x\n", status); + check_sample(output.pSample, NULL, 0, NULL); + ret = IMFSample_Release(output.pSample); + ok(ret == 0, "Release returned %u\n", ret); + + while (h264_encoded_data_len > 4) + { + hr = IMFTransform_ProcessInput(transform, 0, sample, 0); + if (FAILED(hr)) break; + ok(hr == S_OK, "ProcessInput returned %#x\n", hr); + ret = IMFSample_Release(sample); + ok(ret <= 1, "Release returned %u\n", ret); + sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); + } + ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#x\n", hr); + EXPECT_REF(sample, 1); + } + todo_wine + ok(hr == MF_E_TRANSFORM_STREAM_CHANGE, "ProcessOutput returned %#x\n", hr); + ok(output.dwStreamID == 0, "got dwStreamID %u\n", output.dwStreamID); + ok(!!output.pSample, "got pSample %p\n", output.pSample); + todo_wine + ok(output.dwStatus == MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE, + "got dwStatus %#x\n", output.dwStatus); + ok(!output.pEvents, "got pEvents %p\n", output.pEvents); + todo_wine + ok(status == MFT_PROCESS_OUTPUT_STATUS_NEW_STREAMS, + "got status %#x\n", status); + check_sample(output.pSample, NULL, 0, NULL); + ret = IMFSample_Release(output.pSample); + ok(ret == 0, "Release returned %u\n", ret); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret); + ret = IMFSample_Release(sample); + ok(ret == 0, "Release returned %u\n", ret); failed: CoUninitialize(); diff --git a/dlls/mf/tests/resource.rc b/dlls/mf/tests/resource.rc index 931139c741a..17adc3ed46c 100644 --- a/dlls/mf/tests/resource.rc +++ b/dlls/mf/tests/resource.rc @@ -22,3 +22,6 @@ /* @makedep: wmadata.bin */ wmadata.bin RCDATA wmadata.bin + +/* @makedep: h264data.bin */ +h264data.bin RCDATA h264data.bin

1 0

Rémi Bernon : mf/tests: Always initialize sample data in create_sample helper.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: 07cf1313c33c329c0b3201ee1be0e0c3fe0d20c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07cf1313c33c329c0b3201ee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 22 16:47:20 2022 +0100 mf/tests: Always initialize sample data in create_sample helper. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index be8505eb2d3..6dabae1deb0 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5692,18 +5692,15 @@ static IMFSample *create_sample(const BYTE *data, ULONG size) ok(hr == S_OK, "MFCreateSample returned %#x\n", hr); hr = MFCreateMemoryBuffer(size, &media_buffer); ok(hr == S_OK, "MFCreateMemoryBuffer returned %#x\n", hr); - if (data) - { - hr = IMFMediaBuffer_SetCurrentLength(media_buffer, size); - ok(hr == S_OK, "SetCurrentLength returned %#x\n", hr); - hr = IMFMediaBuffer_Lock(media_buffer, &buffer, NULL, &length); - ok(hr == S_OK, "Lock returned %#x\n", hr); - ok(length == size, "got size %u\n", length); - if (!data) memset(buffer, 0xcd, length); - else memcpy(buffer, data, length); - hr = IMFMediaBuffer_Unlock(media_buffer); - ok(hr == S_OK, "Unlock returned %#x\n", hr); - } + hr = IMFMediaBuffer_Lock(media_buffer, &buffer, NULL, &length); + ok(hr == S_OK, "Lock returned %#x\n", hr); + ok(length == 0, "got length %u\n", length); + if (!data) memset(buffer, 0xcd, size); + else memcpy(buffer, data, size); + hr = IMFMediaBuffer_Unlock(media_buffer); + ok(hr == S_OK, "Unlock returned %#x\n", hr); + hr = IMFMediaBuffer_SetCurrentLength(media_buffer, data ? size : 0); + ok(hr == S_OK, "SetCurrentLength returned %#x\n", hr); hr = IMFSample_AddBuffer(sample, media_buffer); ok(hr == S_OK, "AddBuffer returned %#x\n", hr); ret = IMFMediaBuffer_Release(media_buffer);

1 0

Rémi Bernon : mf/tests: Add some H264 decoder GetOutputStreamInfo tests.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: 1d99367ed59a24fced9b1d3228e8a0210dd9c907 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d99367ed59a24fced9b1d32… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 22 16:47:19 2022 +0100 mf/tests: Add some H264 decoder GetOutputStreamInfo tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index a62b8837fd6..be8505eb2d3 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6535,6 +6535,7 @@ static void test_h264_decoder(void) MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Video, MFVideoFormat_H264}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_NV12}; + MFT_OUTPUT_STREAM_INFO output_info; MFT_INPUT_STREAM_INFO input_info; IMFMediaType *media_type; IMFTransform *transform; @@ -6585,6 +6586,18 @@ static void test_h264_decoder(void) todo_wine ok(input_info.cbAlignment == 0, "got cbAlignment %#x\n", input_info.cbAlignment); + flags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; + memset(&output_info, 0xcd, sizeof(output_info)); + hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); + todo_wine + ok(hr == S_OK, "GetOutputStreamInfo returned %#x\n", hr); + todo_wine + ok(output_info.dwFlags == flags, "got dwFlags %#x\n", output_info.dwFlags); + todo_wine + ok(output_info.cbSize == 0x3fc000, "got cbSize %#x\n", output_info.cbSize); + todo_wine + ok(output_info.cbAlignment == 0, "got cbAlignment %#x\n", output_info.cbAlignment); + i = -1; while (SUCCEEDED(hr = IMFTransform_GetInputAvailableType(transform, 0, ++i, &media_type))) { @@ -6619,6 +6632,19 @@ static void test_h264_decoder(void) todo_wine ok(ret == 1, "Release returned %u\n", ret); + flags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; + memset(&output_info, 0xcd, sizeof(output_info)); + hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); + todo_wine + ok(hr == S_OK, "GetOutputStreamInfo returned %#x\n", hr); + todo_wine + ok(output_info.dwFlags == flags, "got dwFlags %#x\n", output_info.dwFlags); + todo_wine + ok(output_info.cbSize == 0x3f4800 || broken(output_info.cbSize == 0x3fc000) /* Win7 */, + "got cbSize %#x\n", output_info.cbSize); + todo_wine + ok(output_info.cbAlignment == 0, "got cbAlignment %#x\n", output_info.cbAlignment); + /* output types can now be enumerated (though they are actually the same for all input types) */ i = -1; @@ -6687,6 +6713,19 @@ static void test_h264_decoder(void) todo_wine ok(input_info.cbAlignment == 0, "got cbAlignment %#x\n", input_info.cbAlignment); + flags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; + memset(&output_info, 0xcd, sizeof(output_info)); + hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); + todo_wine + ok(hr == S_OK, "GetOutputStreamInfo returned %#x\n", hr); + todo_wine + ok(output_info.dwFlags == flags, "got dwFlags %#x\n", output_info.dwFlags); + todo_wine + ok(output_info.cbSize == 0x3f4800 || broken(output_info.cbSize == 0x3fc000) /* Win7 */, + "got cbSize %#x\n", output_info.cbSize); + todo_wine + ok(output_info.cbAlignment == 0, "got cbAlignment %#x\n", output_info.cbAlignment); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret);

1 0

Rémi Bernon : mf/tests: Add some H264 decoder GetInputStreamInfo tests.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: 65cb088386bb90840ea2535c01079d83cc74eb65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65cb088386bb90840ea2535c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 22 16:47:18 2022 +0100 mf/tests: Add some H264 decoder GetInputStreamInfo tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 07f4c28052d..a62b8837fd6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6535,10 +6535,11 @@ static void test_h264_decoder(void) MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Video, MFVideoFormat_H264}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_NV12}; + MFT_INPUT_STREAM_INFO input_info; IMFMediaType *media_type; IMFTransform *transform; + ULONG flags, i, ret; GUID class_id; - ULONG i, ret; HRESULT hr; hr = CoInitialize(NULL); @@ -6568,6 +6569,22 @@ static void test_h264_decoder(void) /* check available input types */ + flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; + memset(&input_info, 0xcd, sizeof(input_info)); + hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); + todo_wine + ok(hr == S_OK, "GetInputStreamInfo returned %#x\n", hr); + todo_wine + ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %s\n", wine_dbgstr_longlong(input_info.hnsMaxLatency)); + todo_wine + ok(input_info.dwFlags == flags, "got dwFlags %#x\n", input_info.dwFlags); + todo_wine + ok(input_info.cbSize == 0x1000, "got cbSize %u\n", input_info.cbSize); + todo_wine + ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#x\n", input_info.cbMaxLookahead); + todo_wine + ok(input_info.cbAlignment == 0, "got cbAlignment %#x\n", input_info.cbAlignment); + i = -1; while (SUCCEEDED(hr = IMFTransform_GetInputAvailableType(transform, 0, ++i, &media_type))) { @@ -6654,6 +6671,22 @@ static void test_h264_decoder(void) todo_wine ok(ret == 1, "Release returned %u\n", ret); + flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; + memset(&input_info, 0xcd, sizeof(input_info)); + hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); + todo_wine + ok(hr == S_OK, "GetInputStreamInfo returned %#x\n", hr); + todo_wine + ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %s\n", wine_dbgstr_longlong(input_info.hnsMaxLatency)); + todo_wine + ok(input_info.dwFlags == flags, "got dwFlags %#x\n", input_info.dwFlags); + todo_wine + ok(input_info.cbSize == 0x1000, "got cbSize %u\n", input_info.cbSize); + todo_wine + ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#x\n", input_info.cbMaxLookahead); + todo_wine + ok(input_info.cbAlignment == 0, "got cbAlignment %#x\n", input_info.cbAlignment); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret);

1 0

Alexandre Julliard : configure: Build demos with -municode on Mingw.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: vkd3d Branch: master Commit: 59d918fd50e6a4fad4052b563bfd248d8ff87013 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=59d918fd50e6a4fad4052b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 23 17:28:11 2022 +0100 configure: Build demos with -municode on Mingw. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index bd58000..265dccc 100644 --- a/configure.ac +++ b/configure.ac @@ -142,7 +142,7 @@ dnl Makefiles case $host_os in mingw32*) AC_SUBST([DEMO_LIBS],["-ld3d12 -ldxgi -lgdi32"]) - AC_SUBST([DEMO_CFLAGS],[""]) + AC_SUBST([DEMO_CFLAGS],["-municode"]) ;; *) AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], [AC_MSG_ERROR([libxcb is required for demos.])])

1 0

Alexandre Julliard : configure: Don't require libxcb to build demos on Mingw.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: vkd3d Branch: master Commit: 02fe9f5bdf5f9268d06da8bbe95f7157cd2be617 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=02fe9f5bdf5f9268d06da8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 23 17:27:30 2022 +0100 configure: Don't require libxcb to build demos on Mingw. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Makefile.am | 4 ++-- configure.ac | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8617a09..2425706 100644 --- a/Makefile.am +++ b/Makefile.am @@ -339,8 +339,8 @@ XFAIL_TESTS = \ endif if BUILD_DEMOS -DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ -DEMOS_CFLAGS = $(AM_CFLAGS) @XCB_CFLAGS@ +DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @DEMO_LIBS@ @VULKAN_LIBS@ +DEMOS_CFLAGS = $(AM_CFLAGS) @DEMO_CFLAGS@ bin_PROGRAMS += $(vkd3d_demos) demos_vkd3d_gears_SOURCES = demos/gears.c diff --git a/configure.ac b/configure.ac index 45220f8..bd58000 100644 --- a/configure.ac +++ b/configure.ac @@ -139,8 +139,17 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) dnl Makefiles -AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], +case $host_os in + mingw32*) + AC_SUBST([DEMO_LIBS],["-ld3d12 -ldxgi -lgdi32"]) + AC_SUBST([DEMO_CFLAGS],[""]) + ;; + *) AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], [AC_MSG_ERROR([libxcb is required for demos.])]) + AC_SUBST([DEMO_LIBS],[$XCB_LIBS]) + AC_SUBST([DEMO_CFLAGS],[$XCB_CFLAGS]) + ;; +esac AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) AM_CONDITIONAL([BUILD_DOC], [test $DX_FLAG_doc = 1]) AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_tests" != "xno"])

1 0

Francois Gouget : testbot/LibvirtTool: Allow taking powered off snapshots.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: tools Branch: master Commit: 00a592969c037ef88c6a7865d3f86dc629a8a4aa URL: https://source.winehq.org/git/tools.git/?a=commit;h=00a592969c037ef88c6a786… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 23 15:55:40 2022 +0100 testbot/LibvirtTool: Allow taking powered off snapshots. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 67 +++++++++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 21 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 759d8ec..5e3e7af 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -610,7 +610,7 @@ sub GetSnapshotConfig($) { $Config->{locale} ||= $1; # take only the last match } - elsif ($Config->{base} =~ s/-(live|tsign|u8)$//) + elsif ($Config->{base} =~ s/-(live|off|tsign|u8)$//) { $Config->{$1} = 1; } @@ -722,33 +722,58 @@ sub CreateSnapshot($$$$) } } - if ($Reboot) + if ($Config->{live}) { - # A reboot is still required for some changes to take effect - ResetBootCount($TA); - Halt($TA, "reboot"); - WaitForBoot($TA); - $Booting = 1; - } - if ($Booting) - { - WaitForSession($TA); - if ($SleepAfterBoot) + if ($Reboot) + { + # A reboot is still required for some changes to take effect + ResetBootCount($TA); + Halt($TA, "reboot"); + WaitForBoot($TA); + $Booting = 1; + } + if ($Booting) { - Debug(Elapsed($Start), " Sleeping ${SleepAfterBoot}s for the $Config->{snapshot} snapshot\n"); - LogMsg "Letting $VMKey settle down for the $Config->{snapshot} snapshot\n"; - sleep($SleepAfterBoot); + WaitForSession($TA); + if ($SleepAfterBoot) + { + Debug(Elapsed($Start), " Sleeping ${SleepAfterBoot}s for the $Config->{snapshot} snapshot\n"); + LogMsg "Letting $VMKey settle down for the $Config->{snapshot} snapshot\n"; + sleep($SleepAfterBoot); + } } + CheckBootCount($TA); + $TA->Disconnect(); # disconnect before taking the snapshot + } + else + { + # Power off the VM for the snapshot + Debug(Elapsed($Start), " Shutting down $VMKey to take the $Config->{snapshot} snapshot\n"); + ResetBootCount($TA); + ShutDown($Domain, $TA); } - CheckBootCount($TA); - $TA->Disconnect(); # disconnect before taking the snapshot Debug(Elapsed($Start), " Creating the $Config->{snapshot} snapshot\n"); my $ErrMessage = $Domain->CreateSnapshot($Config->{snapshot}); if (defined $ErrMessage) { FatalError("Could not create the $Config->{snapshot} snapshot on $VMKey: $ErrMessage\n"); } + return 0 if ($Config->{live}); + + # Without this small pause Libvirt/QEmu sometimes forgets to power on the VM! + sleep(1); + + # The VM was powered off for the snapshot but we need it to be running for + # Revert(). So (revert &) power it on again. + Debug(Elapsed($Start), " Starting $VMKey from the new $Config->{snapshot} snapshot\n"); + ($ErrMessage, $Booting) = $Domain->RevertToSnapshot($Config->{snapshot}); + if (defined $ErrMessage) + { + FatalError("Could not revert $VMKey to $Config->{snapshot}: $ErrMessage\n"); + } + WaitForBoot($TA); + return 1; } sub Revert() @@ -774,9 +799,10 @@ sub Revert() { FatalError("Creating locale snapshots ($Config->{locale}) is not supported for ". $VM->Type ." VMs ($VMKey)\n"); } - if (!$Config->{live}) + if ($Config->{locale} and !$Config->{live}) { - FatalError("Only live snapshots can be created ($VMKey)\n"); + # The --locale and --country changes don't persist across reboots :-( + FatalError("Creating non-live locale snapshots is not supported ($VMKey)\n"); } if (!$Domain->HasSnapshot($Config->{base})) { @@ -836,8 +862,7 @@ sub Revert() if ($Config->{create}) { - CreateSnapshot($Domain, $TA, $Config, $Booting); - $Booting = 0; + $Booting = CreateSnapshot($Domain, $TA, $Config, $Booting); if ($VM->Type eq "build" or $VM->Type eq "wine") {

1 0

Francois Gouget : testbot/LibvirtTool: Separate ShutDown() from ShutDownIfOffSnapshot().
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: tools Branch: master Commit: d342cd997cb100a124baa776d046a3f1653d9ff0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d342cd997cb100a124baa77… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 23 15:55:37 2022 +0100 testbot/LibvirtTool: Separate ShutDown() from ShutDownIfOffSnapshot(). ShutDown() unconditionally performs a clean shutdown while ShutDownIfOffSnapshot() only does so if the VM is currently running a snapshot that requests them (contains '-off' in its name). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 50 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 6364b30..759d8ec 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -311,6 +311,35 @@ sub Halt($$) =pod =over 12 +=item C<ShutDown()> + +Attempt a clean shutdown of the VM (regardless of its current snapshot). + +Returns 0 if the shutdown failed, 1 otherwise. +=back +=cut + +sub ShutDown($$) +{ + my ($Domain, $TA) = @_; + + if (Halt($TA, 0)) + { + Debug(Elapsed($Start), " Waiting for the VM to shut down\n"); + my $Deadline = time() + $WaitForShutdown; + while (time() <= $Deadline) + { + return 1 if (!$Domain->IsPoweredOn()); + sleep(1); + } + Error "Timed out waiting for $VMKey to perform a clean shutdown\n"; + } + return 0; +} + +=pod +=over 12 + =item C<ShutDownIfOffSnapshot()> Attempt a clean shutdown of the VM if it is running a snapshot that requests @@ -320,6 +349,8 @@ Returns 0 if the shutdown failed, 2 if it was successful and 1 if the VM was already powered off or a shutdown was not needed. =back =cut +=back +=cut sub ShutDownIfOffSnapshot() { @@ -333,22 +364,15 @@ sub ShutDownIfOffSnapshot() Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"); LogMsg "Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"; - return 0 if (!Halt($VM->GetAgent(), 0)); - - Debug(Elapsed($Start), " Waiting for the VM to shut down\n"); - my $Deadline = time() + $WaitForShutdown; - while (time() <= $Deadline) + if (ShutDown($Domain, $VM->GetAgent())) { - if (!$Domain->IsPoweredOn()) - { - Debug(Elapsed($Start), " Successfully shut down $VMKey\n"); - LogMsg "Successfully shut down $VMKey\n"; - return 2; - } - sleep(1); + Debug(Elapsed($Start), " Successfully shut down $VMKey\n"); + LogMsg "Successfully shut down $VMKey\n"; + return 2; } - Error "Timed out waiting for $VMKey to perform a clean shutdown. Forcefully shutting down now...\n"; + # In fact the caller will do so + Error "Forcefully shutting down $VMKey/$CurrentSnapshot now...\n"; return 0; }

1 0

Francois Gouget : testbot/web: Rename and fix a loop variable declaration.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: tools Branch: master Commit: da44a1907e8c1e03742ce5e064d252d1bf480861 URL: https://source.winehq.org/git/tools.git/?a=commit;h=da44a1907e8c1e03742ce5e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 23 15:54:59 2022 +0100 testbot/web: Rename and fix a loop variable declaration. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 8d4270a..eef7a17 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -423,8 +423,7 @@ sub GenerateFullLog($$$$) next if ($Group->{LineNo}); print "<div class='LogDllName'>$GroupName</div>\n"; - my $i = 0; - for my $i (0..@{$Group->{Errors}} - 1) + for my $ErrIndex (0..@{$Group->{Errors}} - 1) { if ($IsEmpty) { @@ -432,8 +431,8 @@ sub GenerateFullLog($$$$) $IsEmpty = 0; } - my $Line = $Group->{Errors}->[$i]; - my $Category = $Group->{IsNew}->[$i] ? "new" : "error"; + my $Line = $Group->{Errors}->[$ErrIndex]; + my $Category = $Group->{IsNew}->[$ErrIndex] ? "new" : "error"; my $Html = $self->escapeHTML($Line); print "<span class='log-$Category'>$Html</span>\n"; }

1 0

Francois Gouget : testbot/WineRunReconfig: Avoid variable redefinitions.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: tools Branch: master Commit: 8e21d4317e0141ba606654c9e148295990bd2b47 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8e21d4317e0141ba606654c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 23 15:54:51 2022 +0100 testbot/WineRunReconfig: Avoid variable redefinitions. Luckily these instances were harmless but somewhat confusing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 4 ++-- testbot/bin/WineRunReconfig.pl | 4 ++-- testbot/bin/WineRunTask.pl | 12 ++++++------ testbot/bin/WineRunWineTest.pl | 14 +++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 50696b7..1bddc04 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -432,8 +432,8 @@ if ($TA->GetFile("Build.log", "$TaskDir/task.log")) # that explains why. $NewStatus = "badbuild"; } - my $ErrMessage = CreateLogErrorsCache($LogInfo); - LogTaskError("$ErrMessage\n") if (defined $ErrMessage); + my $LogErrMsg = CreateLogErrorsCache($LogInfo); + LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } elsif (!defined $TAError) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 04308f3..9f71ff4 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -435,8 +435,8 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/task.log")) MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); $NewStatus = "badbuild"; } - my $ErrMessage = CreateLogErrorsCache($LogInfo); - LogTaskError("$ErrMessage\n") if (defined $ErrMessage); + my $LogErrMsg = CreateLogErrorsCache($LogInfo); + LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } elsif (!defined $TAError) { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 72faf10..017e8c4 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -401,8 +401,8 @@ if ($Step->FileType ne "exe32" and $Step->FileType ne "exe64") FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } -(my $ErrMessage, $ReportNames, my $TaskMissions) = $Task->GetReportNames(); -FatalError "$ErrMessage\n" if (defined $ErrMessage); +(my $ReportErr, $ReportNames, my $TaskMissions) = $Task->GetReportNames(); +FatalError "$ReportErr\n" if (defined $ReportErr); FatalError "Cannot specify multiple missions\n" if (@{$TaskMissions->{Missions}} > 1); my $Mission = $TaskMissions->{Missions}->[0]; my $RptFileName = $ReportNames->[0]; @@ -534,8 +534,8 @@ if ($TA->GetFile("Task.log", "$TaskDir/task.log")) { my $LogInfo = ParseTaskLog("$TaskDir/task.log"); $TaskFailures ||= $LogInfo->{ErrCount}; - my $ErrMessage = CreateLogErrorsCache($LogInfo); - LogTaskError("$ErrMessage\n") if (defined $ErrMessage); + my $LogErrMsg = CreateLogErrorsCache($LogInfo); + LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } elsif (!defined $TAError) { @@ -564,8 +564,8 @@ if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) # $LogInfo->{Failures} can legitimately be undefined in case of a timeout $TaskFailures += $LogInfo->{Failures} || 0; - my $ErrMessage = CreateLogErrorsCache($LogInfo, $Task); - LogTaskError("$ErrMessage\n") if (defined $ErrMessage); + my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); + LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } } elsif (!defined $TAError) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index c1a37ae..3526719 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -399,8 +399,8 @@ if (($Step->Type eq "suite" and $Step->FileType ne "none") or FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } -(my $ErrMessage, $ReportNames, my $_TaskMissions) = $Task->GetReportNames(); -FatalError "$ErrMessage\n" if (defined $ErrMessage); +(my $ReportErr, $ReportNames, my $_TaskMissions) = $Task->GetReportNames(); +FatalError "$ReportErr\n" if (defined $ReportErr); # @@ -482,7 +482,7 @@ if (!$Pid) # my $NewStatus = 'completed'; -my ($TaskFailures, $TaskTimedOut, $TAError, $PossibleCrash); +my ($ErrMessage, $TaskFailures, $TaskTimedOut, $TAError, $PossibleCrash); Debug(Elapsed($Start), " Waiting for the script (", $Task->Timeout, "s timeout)\n"); if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) { @@ -543,8 +543,8 @@ if ($TA->GetFile("Task.log", "$TaskDir/task.log")) $TaskFailures = undef; $PossibleCrash = 1; } - my $ErrMessage = CreateLogErrorsCache($LogInfo); - LogTaskError("$ErrMessage\n") if (defined $ErrMessage); + my $LogErrMsg = CreateLogErrorsCache($LogInfo); + LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } elsif (!defined $TAError) { @@ -580,8 +580,8 @@ foreach my $RptFileName (@$ReportNames) # $LogInfo->{Failures} can legitimately be undefined in case of a timeout $TaskFailures += $LogInfo->{Failures} || 0; - my $ErrMessage = CreateLogErrorsCache($LogInfo, $Task); - LogTaskError("$ErrMessage\n") if (defined $ErrMessage); + my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); + LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } } elsif (!defined $TAError and

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022