- Wine-devel - list.winehq.org

[tools v2] testbot/SetWinLocale: Simplify sending the Powershell script.
by Francois Gouget 17 Feb '22

17 Feb '22

Converting the line endings to CR+LF is not needed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Rediffed. I think v1 failed to apply because GetWinProperties() took the place of GetWinSettings(). --- testbot/bin/SetWinLocale | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 73c774e6e4..670de46043 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -662,20 +662,9 @@ sub RegGetValue($;$) # Show the host's locale settings # -if (open(my $fh, "<", "$0.ps1")) +if (!$TA->SendFile("$0.ps1", "$name0.ps1", 0)) { - my $Script = join("", <$fh>); - close($fh); - - $Script =~ s~\n~\r\n~g; - if (!$TA->SendFileFromString($Script, "$name0.ps1", 0)) - { - FatalError("could not send the batch file:", $TA->GetLastError(), "\n"); - } -} -else -{ - FatalError("could not open '$0.ps1' for reading: $!\n"); + FatalError("could not send the Powershell script:", $TA->GetLastError(), "\n"); } sub GetWinProperties($) -- 2.30.2

1 0

[PATCH 1/5] mf/tests: Add some H264 decoder creation tests.
by Rémi Bernon 17 Feb '22

17 Feb '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c4d318a9e43..add48be964a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6135,6 +6135,65 @@ failed: CoUninitialize(); } +static void test_h264_decoder(void) +{ + static const media_type_desc transform_inputs[] = + { + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264_ES), + }, + }; + static const media_type_desc transform_outputs[] = + { + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YV12), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_IYUV), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_I420), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2), + }, + }; + + MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Video, MFVideoFormat_H264}; + MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_NV12}; + IMFTransform *transform; + GUID class_id; + HRESULT hr; + ULONG ret; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + + if (!create_transform(MFT_CATEGORY_VIDEO_DECODER, &input_type, &output_type, L"Microsoft H264 Video Decoder MFT", + transform_inputs, ARRAY_SIZE(transform_inputs), transform_outputs, ARRAY_SIZE(transform_outputs), + &transform, &class_id)) + goto failed; + + ret = IMFTransform_Release(transform); + ok(ret == 0, "Release returned %u\n", ret); + +failed: + CoUninitialize(); +} + START_TEST(mf) { init_functions(); @@ -6170,4 +6229,5 @@ START_TEST(mf) test_MFRequireProtectedEnvironment(); test_wma_encoder(); test_wma_decoder(); + test_h264_decoder(); } -- 2.34.1

2 9

[LEGAL] Contributing to comctrl32 with prior access to the Windows Research Kernel
by Angelo Haller 17 Feb '22

17 Feb '22

Can someone who has had access to the Windows Research Kernel (WRK) still submit patches to tests and comctrl32? The FAQ [0] states that some can still legally submit changes to certain components in certain cases. Is this one of them? As I understand comctrl32 is not part of the WRK. I have seen some scheduler code of the WRK through an assignment in university >~10 years ago. Nothing else. Can I still send in my fixes/patches regarding comctrl32/listview? Thanks, Angelo [0] https://wiki.winehq.org/Developer_FAQ

2 1

[PATCH 1/4] kernelbase: Allow the two initial slashes to be backslashes in UrlGetPart().
by Zebediah Figura 16 Feb '22

16 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/kernelbase/path.c | 8 +++++++- dlls/shlwapi/tests/url.c | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index e29ee585123..befdf237c5e 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4191,6 +4191,11 @@ static const WCHAR *parse_url_element( const WCHAR *url, const WCHAR *separators return url + wcslen( url ); } +static BOOL is_slash( char c ) +{ + return c == '/' || c == '\\'; +} + static void parse_url( const WCHAR *url, struct parsed_url *pl ) { const WCHAR *work; @@ -4200,7 +4205,8 @@ static void parse_url( const WCHAR *url, struct parsed_url *pl ) work = scan_url(pl->scheme, &pl->scheme_len, SCHEME); if (!*work || (*work != ':')) return; work++; - if ((*work != '/') || (*(work+1) != '/')) return; + if (!is_slash( work[0] ) || !is_slash( work[1] )) + return; pl->username = work + 2; work = parse_url_element( pl->username, L":@/\\?#" ); diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 18af0906e08..ae0d0738195 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -661,12 +661,12 @@ static void test_UrlGetPart(void) {"http:/localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL, .todo_hr = TRUE}, {"http://localhost\\index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, - {"http:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, - {"http:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, + {"http:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, + {"http:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"ftp://localhost\\index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, - {"ftp:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, - {"ftp:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, + {"ftp:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, + {"ftp:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"http://host?a:b(a)c:d", URL_PART_HOSTNAME, 0, S_OK, "host"}, {"http://host?a:b(a)c:d", URL_PART_QUERY, 0, S_OK, "a:b(a)c:d"}, -- 2.34.1

1 3

[PATCH 1/6] ncrypt: Fix null pointer.
by Santino Mazza 16 Feb '22

16 Feb '22

Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/ncrypt/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 6b1a87ea785..22e2e9089ef 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -322,6 +322,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n ERR("Error allocating memory."); return NTE_NO_MEMORY; } + property = &object->properties[object->num_properties]; object->num_properties++; } else -- 2.32.0

1 5

[PATCH 1/3] vcomp: Add tests for _vcomp_for_dynamic_init_i8()
by David Koller 16 Feb '22

16 Feb '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52012 Signed-off-by: David Koller <dk(a)cs.stanford.edu> --- dlls/vcomp/tests/vcomp.c | 247 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 247 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index a229e0198f7..19d56820450 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -87,7 +87,10 @@ static void (CDECL *p_vcomp_enter_critsect)(CRITICAL_SECTION **critsect); static void (CDECL *p_vcomp_flush)(void); static void (CDECL *p_vcomp_for_dynamic_init)(unsigned int flags, unsigned int first, unsigned int last, int step, unsigned int chunksize); +static void (CDECL *p_vcomp_for_dynamic_init_i8)(unsigned int flags, ULONG64 first, ULONG64 last, + LONG64 step, ULONG64 chunksize); static int (CDECL *p_vcomp_for_dynamic_next)(unsigned int *begin, unsigned int *end); +static int (CDECL *p_vcomp_for_dynamic_next_i8)(ULONG64 *begin, ULONG64 *end); static void (CDECL *p_vcomp_for_static_end)(void); static void (CDECL *p_vcomp_for_static_init)(int first, int last, int step, int chunksize, unsigned int *loops, int *begin, int *end, int *next, int *lastchunk); @@ -329,7 +332,9 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_enter_critsect); VCOMP_GET_PROC(_vcomp_flush); VCOMP_GET_PROC(_vcomp_for_dynamic_init); + VCOMP_GET_PROC(_vcomp_for_dynamic_init_i8); VCOMP_GET_PROC(_vcomp_for_dynamic_next); + VCOMP_GET_PROC(_vcomp_for_dynamic_next_i8); VCOMP_GET_PROC(_vcomp_for_static_end); VCOMP_GET_PROC(_vcomp_for_static_init); VCOMP_GET_PROC(_vcomp_for_static_init_i8); @@ -1546,6 +1551,60 @@ static void CDECL for_dynamic_static_cb(void) ok(ret == FALSE, "expected ret == FALSE, got %d\n", ret); } +static void CDECL for_dynamic_static_i8_cb(void) +{ + ULONG64 my_begin, my_end, begin, end; + int ret; + + begin = end = 0xdeadbeef; + my_for_static_simple_init_i8(TRUE, 0, 1000, 7, TRUE, &my_begin, &my_end); + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_STATIC | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 1); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == TRUE, "expected ret == TRUE, got %d\n", ret); + ok(begin == my_begin, "expected begin == %s, got %s\n", wine_dbgstr_longlong(my_begin), + wine_dbgstr_longlong(begin)); + ok(end == my_end, "expected end == %s, got %s\n", wine_dbgstr_longlong(my_end), + wine_dbgstr_longlong(end)); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == FALSE, "expected ret == FALSE, got %d\n", ret); + + begin = end = 0xdeadbeef; + my_for_static_simple_init_i8(TRUE, 1000, 0, 7, FALSE, &my_begin, &my_end); + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_STATIC, 1000, 0, 7, 1); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == TRUE, "expected ret == TRUE, got %d\n", ret); + ok(begin == my_begin, "expected begin == %s, got %s\n", wine_dbgstr_longlong(my_begin), + wine_dbgstr_longlong(begin)); + ok(end == my_end, "expected end == %s, got %s\n", wine_dbgstr_longlong(my_end), + wine_dbgstr_longlong(end)); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == FALSE, "expected ret == FALSE, got %d\n", ret); + + begin = end = 0xdeadbeef; + my_for_static_simple_init_i8(TRUE, 0, 1000, 7, TRUE, &my_begin, &my_end); + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_STATIC | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 5); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == TRUE, "expected ret == TRUE, got %d\n", ret); + ok(begin == my_begin, "expected begin == %s, got %s\n", wine_dbgstr_longlong(my_begin), + wine_dbgstr_longlong(begin)); + ok(end == my_end, "expected end == %s, got %s\n", wine_dbgstr_longlong(my_end), + wine_dbgstr_longlong(end)); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == FALSE, "expected ret == FALSE, got %d\n", ret); + + begin = end = 0xdeadbeef; + my_for_static_simple_init_i8(TRUE, 1000, 0, 7, FALSE, &my_begin, &my_end); + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_STATIC, 1000, 0, 7, 5); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == TRUE, "expected ret == TRUE, got %d\n", ret); + ok(begin == my_begin, "expected begin == %s, got %s\n", wine_dbgstr_longlong(my_begin), + wine_dbgstr_longlong(begin)); + ok(end == my_end, "expected end == %s, got %s\n", wine_dbgstr_longlong(my_end), + wine_dbgstr_longlong(end)); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == FALSE, "expected ret == FALSE, got %d\n", ret); +} + static void CDECL for_dynamic_chunked_cb(LONG *a, LONG *b, LONG *c, LONG *d) { unsigned int begin, end; @@ -1583,6 +1642,47 @@ static void CDECL for_dynamic_chunked_cb(LONG *a, LONG *b, LONG *c, LONG *d) } } +static void CDECL for_dynamic_chunked_i8_cb(LONG64 *a, LONG64 *b, LONG64 *c, LONG64 *d) +{ + ULONG64 begin, end; + + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_CHUNKED | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 1); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + if (begin == 994) ok(end == 1000, "expected end == 1000, got %s\n", wine_dbgstr_longlong(end)); + else ok(begin == end, "expected begin == end, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(a, begin); + } + + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_CHUNKED, 1000, 0, 7, 1); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + if (begin == 6) ok(end == 0, "expected end == 0, got %s\n", wine_dbgstr_longlong(end)); + else ok(begin == end, "expected begin == end, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(b, begin); + } + + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_CHUNKED | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 5); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + if (begin == 980) ok(end == 1000, "expected end == 1000, got %s\n", wine_dbgstr_longlong(end)); + else ok(begin + 28 == end, "expected begin + 28 == end, got %s and %s\n", + wine_dbgstr_longlong(begin + 28), wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(c, begin); + } + + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_CHUNKED, 1000, 0, 7, 5); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + if (begin == 20) ok(end == 0, "expected end == 0, got %s\n", wine_dbgstr_longlong(end)); + else ok(begin - 28 == end, "expected begin - 28 == end, got %s and %s\n", + wine_dbgstr_longlong(begin - 28), wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(d, begin); + } +} + static void CDECL for_dynamic_guided_cb(unsigned int flags, LONG *a, LONG *b, LONG *c, LONG *d) { int num_threads = pomp_get_num_threads(); @@ -1621,6 +1721,48 @@ static void CDECL for_dynamic_guided_cb(unsigned int flags, LONG *a, LONG *b, LO } } +static void CDECL for_dynamic_guided_i8_cb(unsigned int flags, LONG64 *a, LONG64 *b, LONG64 *c, LONG64 *d) +{ + int num_threads = pomp_get_num_threads(); + ULONG64 begin, end; + + p_vcomp_for_dynamic_init_i8(flags | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 1); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + ok(num_threads != 1 || (begin == 0 && end == 1000), + "expected begin == 0 and end == 1000, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(a, begin); + } + + p_vcomp_for_dynamic_init_i8(flags, 1000, 0, 7, 1); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + ok(num_threads != 1 || (begin == 1000 && end == 0), + "expected begin == 1000 and end == 0, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(b, begin); + } + + p_vcomp_for_dynamic_init_i8(flags | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 5); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + ok(num_threads != 1 || (begin == 0 && end == 1000), + "expected begin == 0 and end == 1000, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(c, begin); + } + + p_vcomp_for_dynamic_init_i8(flags, 1000, 0, 7, 5); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + ok(num_threads != 1 || (begin == 1000 && end == 0), + "expected begin == 1000 and end == 0, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(d, begin); + } +} + static void test_vcomp_for_dynamic_init(void) { static const int guided_a[] = {0, 6041, 9072, 11179}; @@ -1725,6 +1867,110 @@ static void test_vcomp_for_dynamic_init(void) pomp_set_num_threads(max_threads); } +static void test_vcomp_for_dynamic_init_i8(void) +{ + static const int guided_a[] = {0, 6041, 9072, 11179}; + static const int guided_b[] = {1000, 1959, 2928, 3821}; + static const int guided_c[] = {0, 4067, 6139, 7273}; + static const int guided_d[] = {1000, 1933, 2861, 3727}; + LONG64 a, b, c, d; + int max_threads = pomp_get_max_threads(); + int i; + + /* test static scheduling */ + for_dynamic_static_i8_cb(); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + p_vcomp_fork(TRUE, 0, for_dynamic_static_i8_cb); + p_vcomp_fork(FALSE, 0, for_dynamic_static_i8_cb); + } + + /* test chunked scheduling */ + a = b = c = d = 0; + for_dynamic_chunked_i8_cb(&a, &b, &c, &d); + ok(a == 71071, "expected a == 71071, got %s\n", wine_dbgstr_longlong(a)); + ok(b == 71929, "expected b == 71929, got %s\n", wine_dbgstr_longlong(b)); + ok(c == 14210, "expected c == 14210, got %s\n", wine_dbgstr_longlong(c)); + ok(d == 14790, "expected d == 14790, got %s\n", wine_dbgstr_longlong(d)); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + + a = b = c = d = 0; + p_vcomp_fork(TRUE, 4, for_dynamic_chunked_i8_cb, &a, &b, &c, &d); + ok(a == 71071, "expected a == 71071, got %s\n", wine_dbgstr_longlong(a)); + ok(b == 71929, "expected b == 71929, got %s\n", wine_dbgstr_longlong(b)); + ok(c == 14210, "expected c == 14210, got %s\n", wine_dbgstr_longlong(c)); + ok(d == 14790, "expected d == 14790, got %s\n", wine_dbgstr_longlong(d)); + + a = b = c = d = 0; + p_vcomp_fork(FALSE, 4, for_dynamic_chunked_i8_cb, &a, &b, &c, &d); + ok(a == 71071, "expected a == 71071, got %s\n", wine_dbgstr_longlong(a)); + ok(b == 71929, "expected b == 71929, got %s\n", wine_dbgstr_longlong(b)); + ok(c == 14210, "expected c == 14210, got %s\n", wine_dbgstr_longlong(c)); + ok(d == 14790, "expected d == 14790, got %s\n", wine_dbgstr_longlong(d)); + } + + /* test guided scheduling */ + a = b = c = d = 0; + for_dynamic_guided_i8_cb(VCOMP_DYNAMIC_FLAGS_GUIDED, &a, &b, &c, &d); + ok(a == guided_a[0], "expected a == %d, got %s\n", guided_a[0], wine_dbgstr_longlong(a)); + ok(b == guided_b[0], "expected b == %d, got %s\n", guided_b[0], wine_dbgstr_longlong(b)); + ok(c == guided_c[0], "expected c == %d, got %s\n", guided_c[0], wine_dbgstr_longlong(c)); + ok(d == guided_d[0], "expected d == %d, got %s\n", guided_d[0], wine_dbgstr_longlong(d)); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + + a = b = c = d = 0; + p_vcomp_fork(TRUE, 5, for_dynamic_guided_i8_cb, VCOMP_DYNAMIC_FLAGS_GUIDED, &a, &b, &c, &d); + ok(a == guided_a[i - 1], "expected a == %d, got %s\n", guided_a[i - 1], wine_dbgstr_longlong(a)); + ok(b == guided_b[i - 1], "expected b == %d, got %s\n", guided_b[i - 1], wine_dbgstr_longlong(b)); + ok(c == guided_c[i - 1], "expected c == %d, got %s\n", guided_c[i - 1], wine_dbgstr_longlong(c)); + ok(d == guided_d[i - 1], "expected d == %d, got %s\n", guided_d[i - 1], wine_dbgstr_longlong(d)); + + a = b = c = d = 0; + p_vcomp_fork(FALSE, 5, for_dynamic_guided_i8_cb, VCOMP_DYNAMIC_FLAGS_GUIDED, &a, &b, &c, &d); + ok(a == guided_a[0], "expected a == %d, got %s\n", guided_a[0], wine_dbgstr_longlong(a)); + ok(b == guided_b[0], "expected b == %d, got %s\n", guided_b[0], wine_dbgstr_longlong(b)); + ok(c == guided_c[0], "expected c == %d, got %s\n", guided_c[0], wine_dbgstr_longlong(c)); + ok(d == guided_d[0], "expected d == %d, got %s\n", guided_d[0], wine_dbgstr_longlong(d)); + } + + /* test with empty flags */ + a = b = c = d = 0; + for_dynamic_guided_i8_cb(0, &a, &b, &c, &d); + ok(a == guided_a[0], "expected a == %d, got %s\n", guided_a[0], wine_dbgstr_longlong(a)); + ok(b == guided_b[0], "expected b == %d, got %s\n", guided_b[0], wine_dbgstr_longlong(b)); + ok(c == guided_c[0], "expected c == %d, got %s\n", guided_c[0], wine_dbgstr_longlong(c)); + ok(d == guided_d[0], "expected d == %d, got %s\n", guided_d[0], wine_dbgstr_longlong(d)); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + + a = b = c = d = 0; + p_vcomp_fork(TRUE, 5, for_dynamic_guided_i8_cb, 0, &a, &b, &c, &d); + ok(a == guided_a[i - 1], "expected a == %d, got %s\n", guided_a[i - 1], wine_dbgstr_longlong(a)); + ok(b == guided_b[i - 1], "expected b == %d, got %s\n", guided_b[i - 1], wine_dbgstr_longlong(b)); + ok(c == guided_c[i - 1], "expected c == %d, got %s\n", guided_c[i - 1], wine_dbgstr_longlong(c)); + ok(d == guided_d[i - 1], "expected d == %d, got %s\n", guided_d[i - 1], wine_dbgstr_longlong(d)); + + a = b = c = d = 0; + p_vcomp_fork(FALSE, 5, for_dynamic_guided_i8_cb, 0, &a, &b, &c, &d); + ok(a == guided_a[0], "expected a == %d, got %s\n", guided_a[0], wine_dbgstr_longlong(a)); + ok(b == guided_b[0], "expected b == %d, got %s\n", guided_b[0], wine_dbgstr_longlong(b)); + ok(c == guided_c[0], "expected c == %d, got %s\n", guided_c[0], wine_dbgstr_longlong(c)); + ok(d == guided_d[0], "expected d == %d, got %s\n", guided_d[0], wine_dbgstr_longlong(d)); + } + + pomp_set_num_threads(max_threads); +} + static void CDECL master_cb(HANDLE semaphore) { int num_threads = pomp_get_num_threads(); @@ -2644,6 +2890,7 @@ START_TEST(vcomp) test_vcomp_for_static_simple_init(); test_vcomp_for_static_init(); test_vcomp_for_dynamic_init(); + test_vcomp_for_dynamic_init_i8(); test_vcomp_master_begin(); test_vcomp_single_begin(); test_vcomp_enter_critsect(); -- 2.25.1

2 4

[PATCH 1/2] user32: Test Get/SetWindowPlacement with invalid length.
by Esme Povirk 16 Feb '22

16 Feb '22

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/user32/tests/win.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cb6b61e59c0..b1ef97c01d6 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -12086,6 +12086,17 @@ static void test_window_placement(void) GetWindowRect(hwnd, &rect); ok(EqualRect(&rect, &orig), "got window rect %s\n", wine_dbgstr_rect(&rect)); + ret = SetWindowPlacement(hwnd, &wp); + ok(ret, "failed to set window placement, error %u\n", GetLastError()); + + wp.length = 0; + SetLastError(0xdeadbeef); + ret = SetWindowPlacement(hwnd, &wp); +todo_wine { + ok(!ret, "SetWindowPlacement should have failed\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); +} + DestroyWindow(hwnd); } @@ -12245,7 +12256,7 @@ static void test_arrange_iconic_windows(void) static void other_process_proc(HWND hwnd) { HANDLE window_ready_event, test_done_event; - WINDOWPLACEMENT wp; + WINDOWPLACEMENT wp = {0}; DWORD ret; window_ready_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_opw_window"); -- 2.30.2

3 4

[PATCH v3 1/5] winegstreamer: Remove unnecessary DECLSPEC_HIDDEN qualifier.
by Rémi Bernon 16 Feb '22

16 Feb '22

On PE internal functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Remove DECLSPEC_HIDDEN and add a patch first to make it consistent. Reorder patches and improve error handling, prefer NTSTATUS values for error codes. dlls/winegstreamer/gst_private.h | 64 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 222bce3b2c7..3584f465218 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -39,7 +39,7 @@ #include "unixlib.h" -bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size) DECLSPEC_HIDDEN; +bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size); static inline const char *debugstr_time(REFERENCE_TIME time) { @@ -64,60 +64,60 @@ static inline const char *debugstr_time(REFERENCE_TIME time) #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) -struct wg_parser *wg_parser_create(enum wg_parser_type type, bool unlimited_buffering) DECLSPEC_HIDDEN; -void wg_parser_destroy(struct wg_parser *parser) DECLSPEC_HIDDEN; +struct wg_parser *wg_parser_create(enum wg_parser_type type, bool unlimited_buffering); +void wg_parser_destroy(struct wg_parser *parser); -HRESULT wg_parser_connect(struct wg_parser *parser, uint64_t file_size) DECLSPEC_HIDDEN; -void wg_parser_disconnect(struct wg_parser *parser) DECLSPEC_HIDDEN; +HRESULT wg_parser_connect(struct wg_parser *parser, uint64_t file_size); +void wg_parser_disconnect(struct wg_parser *parser); -void wg_parser_begin_flush(struct wg_parser *parser) DECLSPEC_HIDDEN; -void wg_parser_end_flush(struct wg_parser *parser) DECLSPEC_HIDDEN; +void wg_parser_begin_flush(struct wg_parser *parser); +void wg_parser_end_flush(struct wg_parser *parser); -bool wg_parser_get_next_read_offset(struct wg_parser *parser, uint64_t *offset, uint32_t *size) DECLSPEC_HIDDEN; -void wg_parser_push_data(struct wg_parser *parser, const void *data, uint32_t size) DECLSPEC_HIDDEN; +bool wg_parser_get_next_read_offset(struct wg_parser *parser, uint64_t *offset, uint32_t *size); +void wg_parser_push_data(struct wg_parser *parser, const void *data, uint32_t size); -uint32_t wg_parser_get_stream_count(struct wg_parser *parser) DECLSPEC_HIDDEN; -struct wg_parser_stream *wg_parser_get_stream(struct wg_parser *parser, uint32_t index) DECLSPEC_HIDDEN; +uint32_t wg_parser_get_stream_count(struct wg_parser *parser); +struct wg_parser_stream *wg_parser_get_stream(struct wg_parser *parser, uint32_t index); -void wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format) DECLSPEC_HIDDEN; -void wg_parser_stream_enable(struct wg_parser_stream *stream, const struct wg_format *format) DECLSPEC_HIDDEN; -void wg_parser_stream_disable(struct wg_parser_stream *stream) DECLSPEC_HIDDEN; +void wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format); +void wg_parser_stream_enable(struct wg_parser_stream *stream, const struct wg_format *format); +void wg_parser_stream_disable(struct wg_parser_stream *stream); -bool wg_parser_stream_get_event(struct wg_parser_stream *stream, struct wg_parser_event *event) DECLSPEC_HIDDEN; +bool wg_parser_stream_get_event(struct wg_parser_stream *stream, struct wg_parser_event *event); bool wg_parser_stream_copy_buffer(struct wg_parser_stream *stream, - void *data, uint32_t offset, uint32_t size) DECLSPEC_HIDDEN; -void wg_parser_stream_release_buffer(struct wg_parser_stream *stream) DECLSPEC_HIDDEN; + void *data, uint32_t offset, uint32_t size); +void wg_parser_stream_release_buffer(struct wg_parser_stream *stream); void wg_parser_stream_notify_qos(struct wg_parser_stream *stream, - bool underflow, double proportion, int64_t diff, uint64_t timestamp) DECLSPEC_HIDDEN; + bool underflow, double proportion, int64_t diff, uint64_t timestamp); /* Returns the duration in 100-nanosecond units. */ -uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream) DECLSPEC_HIDDEN; +uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream); /* start_pos and stop_pos are in 100-nanosecond units. */ void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, - uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags) DECLSPEC_HIDDEN; + uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags); unsigned int wg_format_get_max_size(const struct wg_format *format); -HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out); +HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out); +HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out); +HRESULT wave_parser_create(IUnknown *outer, IUnknown **out); +HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out); bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool wm); bool amt_to_wg_format(const AM_MEDIA_TYPE *mt, struct wg_format *format); -BOOL init_gstreamer(void) DECLSPEC_HIDDEN; +BOOL init_gstreamer(void); -extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) DECLSPEC_HIDDEN; -extern HRESULT mfplat_DllRegisterServer(void) DECLSPEC_HIDDEN; +extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj); +extern HRESULT mfplat_DllRegisterServer(void); -IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format) DECLSPEC_HIDDEN; -void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format) DECLSPEC_HIDDEN; +IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format); +void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format); -HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN; +HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj); -HRESULT audio_converter_create(REFIID riid, void **ret) DECLSPEC_HIDDEN; +HRESULT audio_converter_create(REFIID riid, void **ret); struct wm_stream { -- 2.34.1

2 9

[tools 1/2] testbot/SetWinLocale: Add an 'info LOCALE' action to the Powershell script.
by Francois Gouget 16 Feb '22

16 Feb '22

It returns Windows' 'canonical' locale identifier as well as the default keyboard layout. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale.ps1 | 50 ++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/testbot/bin/SetWinLocale.ps1 b/testbot/bin/SetWinLocale.ps1 index ed8fa29ee1..26bd03fdfd 100644 --- a/testbot/bin/SetWinLocale.ps1 +++ b/testbot/bin/SetWinLocale.ps1 @@ -103,6 +103,52 @@ function ShowSettings() exit 0 } +function GetLocaleInfo($Locale) +{ + $LInfo= New-WinUserLanguageList $Locale + $LInfo = $LInfo[0] + + # Window synthesizes an Autonym for unknown/uninstalled locales (e.g. fr-DE), + # but cannot recommend a keyboard layout. + # Note also that installing a locale (e.g. fr-FR) typically also installs + # (at least the core functionality of) related locales (e.g. fr-BE), even + # though those are not shown as installed in the GUI. + if ($LInfo.InputMethodTips[0] -eq $null) + { + return $null + } + + # 'Canonicalize' the LanguageTag by picking the matching entry from the + # installed languages list. + $List = Get-WinUserLanguageList + foreach ($L in $List) + { + if ($LInfo.Autonym -eq $L.Autonym) + { + return $L + } + } + return $LInfo +} + + +function ShowLocaleInfo($Argv) +{ + $Locale = $Argv[1] +GetLocaleInfo($Locale) + $LInfo = GetLocaleInfo($Locale) + if ($LInfo -eq $null) + { + echo "$Name0:error: unknown locale $Locale. Is it installed?" + exit 1 + } + + Write-Output "LanguageTag=$($LInfo.LanguageTag)" + Write-Output "Autonym=$($LInfo.Autonym)" + Write-Output "LocalizedName=$($LInfo.LocalizedName)" + Write-Output "InputMethodTips=$($LInfo.InputMethodTips)" + exit 0 +} # # Modify the Windows locales settings through intl.cpl @@ -309,6 +355,7 @@ function SetLocales($Argv) function ShowUsage() { Write-Output "Usage: $Name0 settings" + Write-Output "or $Name0 info LOCALE" Write-Output "or $Name0 intlconfig LOCALE COUNTRYID SYSTEM UTF8 MUI KEYBOARDID SYSCOPY DEFCOPY" Write-Output "or $Name0 locales LOCALE COUNTRYID SYSTEM UTF8 MUI KEYBOARDID SYSCOPY DEFCOPY USEINTLCPL" Write-Output "or $Name0 -?" @@ -317,6 +364,8 @@ function ShowUsage() Write-Output "" Write-Output "Where:" Write-Output " settings Show the current Windows locale settings." + Write-Output " info Show information about the specified locale. In particular it" + Write-Output " shows Windows' 'canonical' locale identifier." Write-Output " intlconfig Generates an XML configuration file for intl.cpl." Write-Output " locales Modifies the locales either through the Powershell APIs or" Write-Output " intl.cpl." @@ -341,6 +390,7 @@ function ShowUsage() $Action = $args[0] if ($Action -eq "settings") { ShowSettings } +if ($Action -eq "info") { ShowLocaleInfo $args } if ($Action -eq "intlconfig") { ShowIntlConfig $args } if ($Action -eq "locales") { SetLocales $args } $Rc = 0 -- 2.30.2

1 1

[tools 1/2] testbot/LibvirtTool: Reorganize the snapshot creation.
by Francois Gouget 16 Feb '22

16 Feb '22

WaitForBoot() is responsible for establishing the first connection after the VM boots, which can take longer than usual. PrepareVM() replaces SetupTestAgentd() and performs all the tasks needed to make the VM ready for the tests. CreateSnapshot() now also configures the VM before creating the Libvirt snapshot. And CheckBootCount() verifies that the VM did not crash at some point during the process. It is now systematically called before creating snapshots or declaring the VM fit for duty. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 228 ++++++++++++++++++++++--------------- 1 file changed, 135 insertions(+), 93 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index cfdb251694..aecca4b534 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -454,6 +454,21 @@ sub CheckOff() return ChangeStatus("dirty", "off", "done"); } +sub WaitForBoot($) +{ + my ($TA) = @_; + + Debug(Elapsed($Start), " Waiting for the VM to boot\n"); + LogMsg "Waiting for $VMKey to boot\n"; + my $MinTimeout = $TA->SetConnectTimeout(undef, undef, $WaitForBoot); + if (!$TA->GetVersion()) + { + my $ErrMessage = $TA->GetLastError(); + FatalError("Could not connect to the $VMKey TestAgent: $ErrMessage\n"); + } + $TA->SetConnectTimeout(undef, undef, $MinTimeout); +} + sub WaitForSession($) { my ($TA) = @_; @@ -478,14 +493,33 @@ sub WaitForSession($) } } -sub SetupTestAgentd($$$) +sub CheckBootCount($) +{ + my ($TA) = @_; + + # Check that TestAgentd is not displaying the "Has Windows rebooted?" warning. + my $Count = $TA->GetProperties("start.count"); + if (defined $Count and $Count > 1) + { + FatalError("$VMKey has been rebooted too many times: start.count=$Count > 1\n"); + } +} + +sub ResetBootCount($) +{ + my ($TA) = @_; + + # Check the boot count before resetting it + CheckBootCount($TA); + $TA->SetProperty("start.count", 0); +} + +sub PrepareVM($) { - my ($Booting, $UpgradeTestAgentd, $ResetStartCount) = @_; + my ($TA) = @_; Debug(Elapsed($Start), " Setting up the $VMKey TestAgent server\n"); LogMsg "Setting up the $VMKey TestAgent server\n"; - my $TA = $VM->GetAgent(); - $TA->SetConnectTimeout(undef, undef, $WaitForBoot) if ($Booting); my $Version = $TA->GetVersion(); if (!$Version) { @@ -493,9 +527,58 @@ sub SetupTestAgentd($$$) FatalError("Could not connect to the $VMKey TestAgent: $ErrMessage\n"); } - # Upgrade TestAgentd - if ($UpgradeTestAgentd and ($VM->Type eq "win32" or $VM->Type eq "win64")) + # Always update the guest's system time + # This is needed not only for the tests (date is important when checking + # HTTPS certificates), but also for the build (if the time moves forward + # during the build some ccache versions will return a compilation error). + my $PTA = GetPrivilegedTA($TA); + FatalError("$VMKey has no privileged TestAgent server\n") if (!$PTA); + if (!$PTA->SetTime()) + { + FatalError("Setting the $VMKey system time failed: ". $PTA->GetLastError() ."\n"); + } +} + +sub GetSnapshotConfig($) +{ + my ($Config) = @_; + + # Don't stack snapshots. For instance assume the snapshot name is + # 'test-live-fr-FR-tsign' and that 'test-live-fr-FR' already exists + # (typically because it is used by another VM): + # - It's probably better if snapshots are independent from each other. + # - Applying the 'tsign' flag on top of the existing snapshot requires a + # Windows reboot. But format locale changes may not stick across reboots. + # - Stopping the snapshot name parsing when finding an existing snapshot name + # would lose the 'live' flag resulting in an error (or the wrong type of + # snapshot. Avoiding this issue would result in more complexity. + # - Finally snapshot stacking does not seem that useful. + # - A consequence is that the base snapshot should be called 'test' and not + # 'test-live'. + while (1) + { + if ($Config->{base} =~ s/-([a-z]{2}-[A-Z]{2})$//) + { + $Config->{locale} ||= $1; # take only the last match + } + elsif ($Config->{base} =~ s/-(live)$//) + { + $Config->{$1} = 1; + } + else + { + last; + } + } +} + +sub CreateSnapshot($$$$) +{ + my ($Domain, $TA, $Config, $Booting) = @_; + + if ($VM->Type =~ /^win(?:32|64)$/) { + my $Version = $TA->GetVersion(); Debug(Elapsed($Start), " Upgrading the $VMKey TestAgent server from $Version\n"); LogMsg "Upgrading the $VMKey TestAgent server from $Version\n"; if ($Version !~ / ([0-9]+)\.([0-9]+)$/) @@ -532,76 +615,41 @@ sub SetupTestAgentd($$$) # A side effect is that it will force TestAgentd.exe.old to stay around. } - # Always update the guest's system time - # This is needed not only for the tests (date is important when checking - # HTTPS certificates), but also for the build (if the time moves forward - # during the build some ccache versions will return a compilation error). - my $PTA = GetPrivilegedTA($TA); - FatalError("Cannot set the $VMKey VM system time\n") if (!$PTA); - if (!$PTA->SetTime()) + if ($Config->{locale}) { - FatalError("Setting the $VMKey VM system time failed: ". $PTA->GetLastError() ."\n"); - } - - WaitForSession($TA) if ($Booting); + Debug(Elapsed($Start), " Setting up the $Config->{locale} locale on $VMKey\n"); + # SetWinLocale --default performs a reboot and WaitForBoot() + ResetBootCount($TA); + $TA->Disconnect(); + $Booting = 1; - if ($ResetStartCount) - { - # If SetProperty() is not supported neither is --show-restarts. - # So it all works out. - $TA->SetProperty("start.count", 0); - } - elsif ($Booting) - { - # Check that TestAgentd is not displaying the "Has Windows rebooted?" - # warning. - my $Count = $TA->GetProperties("start.count"); - if (defined $Count and $Count > 1) + my @Cmd = ("$BinDir/SetWinLocale", $VM->Hostname, "--default", $Config->{locale}); + push @Cmd, "--debug" if ($Debug); + Debug("Running: ", join(" ", @Cmd), "\n"); + if (system(@Cmd)) { - FatalError("$VMKey has been rebooted too many times: start.count=$Count > 1"); + FatalError("Could not set the $VMKey locale to $Config->{locale}\n"); } } - $PTA->Disconnect(); - $TA->Disconnect(); -} - -sub GetSnapshotConfig($) -{ - my ($Config) = @_; - while (1) + if ($Booting) { - if ($Config->{base} =~ s/-([a-z]{2}-[A-Z]{2})$//) - { - $Config->{locale} = $1; - } - elsif ($Config->{base} =~ s/-(live)$//) - { - $Config->{$1} = 1; - } - else + WaitForSession($TA); + if ($SleepAfterBoot) { - last; + 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); } } -} - -sub CreateSnapshot($$) -{ - my ($Domain, $SnapshotName) = @_; - - if ($SleepAfterBoot != 0) - { - Debug(Elapsed($Start), " Sleeping ${SleepAfterBoot}s for the $SnapshotName snapshot\n"); - LogMsg "Letting $VMKey settle down for the $SnapshotName snapshot\n"; - sleep($SleepAfterBoot); - } + CheckBootCount($TA); - Debug(Elapsed($Start), " Creating the $SnapshotName snapshot\n"); - my $ErrMessage = $Domain->CreateSnapshot($SnapshotName); + $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 recreate the $SnapshotName snapshot on $VMKey: $ErrMessage\n"); + FatalError("Could not create the $Config->{snapshot} snapshot on $VMKey: $ErrMessage\n"); } } @@ -613,13 +661,17 @@ sub Revert() return 1; } $CurrentStatus = "reverting"; - my $Config = { base => $VM->IdleSnapshot }; + my $Config = { + base => $VM->IdleSnapshot, + snapshot => $VM->IdleSnapshot, + }; my $Domain = $VM->GetDomain(); if (!$Domain->HasSnapshot($Config->{base})) { $Config->{create} = 1; GetSnapshotConfig($Config); + Debug(join(" ", Elapsed($Start), "Config:", map { "$_=$Config->{$_}" } sort keys %$Config), "\n"); if ($Config->{locale} and $VM->Type !~ /^win(?:32|64)$/) { FatalError("Creating locale snapshots ($Config->{locale}) is not supported for ". $VM->Type ." VMs ($VMKey)\n"); @@ -655,8 +707,8 @@ sub Revert() if (defined $ErrMessage) { # Libvirt/QEmu is buggy and cannot revert a running VM from one hardware - # configuration to another. So try again after powering off the VM, though - # this can be much slower. + # configuration to another. So try again after forcefully powering off + # the VM, though this can be much slower. Debug(Elapsed($Start), " Powering off the VM\n"); $ErrMessage = $Domain->PowerOff(); if (defined $ErrMessage) @@ -672,33 +724,22 @@ sub Revert() FatalError("Could not revert $VMKey to $Config->{base}: $ErrMessage\n"); } - # Mark the VM as sleeping which allows the scheduler to abort the revert in - # favor of higher priority tasks. But don't allow interruptions in the - # middle of snapshot creation! if (!$Config->{create}) { + # Mark the VM as sleeping which allows the scheduler to abort the revert in + # favor of higher priority tasks. But don't allow interruptions in the + # middle of snapshot creation! return 1 if (ChangeStatus("reverting", "sleeping")); } - # Set up the TestAgent server. Note that setting the locale will require a - # reboot so reset start.count in that case. - SetupTestAgentd($Booting, $Config->{create}, $Config->{locale}); - - # Set up the VM locale - if ($Config->{locale}) - { - Debug(Elapsed($Start), " Setting up the $Config->{locale} locale on $VMKey\n"); - my @Cmd = ("$BinDir/SetWinLocale", $VM->Hostname, "--default", $Config->{locale}); - push @Cmd, "--debug" if ($Debug); - if (system(@Cmd)) - { - FatalError("Could not set the $VMKey locale to $Config->{locale}\n"); - } - } + my $TA = $VM->GetAgent(); + WaitForBoot($TA) if ($Booting); + PrepareVM($TA); if ($Config->{create}) { - CreateSnapshot($Domain, $VM->IdleSnapshot); + CreateSnapshot($Domain, $TA, $Config, $Booting); + $Booting = 0; if ($VM->Type eq "build" or $VM->Type eq "wine") { @@ -721,15 +762,16 @@ sub Revert() # The activity monitor does not like it when VMs skip the sleeping step return 1 if (ChangeStatus("reverting", "sleeping")); } - else - { - my $Sleep = ($Booting and $SleepAfterBoot > $SleepAfterRevert) ? - $SleepAfterBoot : $SleepAfterRevert; - Debug(Elapsed($Start), " Sleeping ${Sleep}s\n"); - LogMsg "Letting $VMKey settle down for ${Sleep}s\n"; - sleep($Sleep); - } + WaitForSession($TA) if ($Booting); + + my $Sleep = ($Booting and $SleepAfterBoot > $SleepAfterRevert) ? + $SleepAfterBoot : $SleepAfterRevert; + Debug(Elapsed($Start), " Sleeping ${Sleep}s\n"); + LogMsg "Letting $VMKey settle down for ${Sleep}s\n"; + sleep($Sleep); + + CheckBootCount($TA); return ChangeStatus($CurrentStatus, "idle", "done"); } -- 2.30.2

1 1