December 2019 - Wine-commits

Alexandre Julliard : ntdll: Fix memory leak in RtlNormalizeString().
by Alexandre Julliard 30 Dec '19

30 Dec '19

Module: wine Branch: master Commit: aeab1b2a6bd75404dfd6918bfca10caad5c44b30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aeab1b2a6bd75404dfd6918b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 30 12:05:32 2019 +0100 ntdll: Fix memory leak in RtlNormalizeString(). Spotted by Piotr Caban. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 7e85f344dd..b3717b3316 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1592,6 +1592,7 @@ NTSTATUS WINAPI RtlNormalizeString( ULONG form, const WCHAR *src, INT src_len, W res = wine_decompose_string( flags, src, src_len, buf, buf_len ); if (res) break; buf_len *= 2; + RtlFreeHeap( GetProcessHeap(), 0, buf ); } }

1 0

Zebediah Figura : ntdll/tests: Fix some test failures with Windows 10.
by Alexandre Julliard 30 Dec '19

30 Dec '19

Module: wine Branch: master Commit: 3b09a6b1bc7b2db99c4e9ee3c135b1f40d3a06de URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b09a6b1bc7b2db99c4e9ee3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 27 11:39:26 2019 -0600 ntdll/tests: Fix some test failures with Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 9bb8d25020..51562786e9 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -387,7 +387,9 @@ todo_wine /* Open is case sensitive unless OBJ_CASE_INSENSITIVE is specified. */ pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine" ); status = pNtOpenKey(&key, KEY_READ, &attr); - todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenKey Failed: 0x%08x\n", status); + ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_SUCCESS /* Win10 1607+ */, + "NtOpenKey Failed: 0x%08x\n", status); + if (!status) pNtClose( key ); attr.Attributes = OBJ_CASE_INSENSITIVE; status = pNtOpenKey(&key, KEY_READ, &attr); @@ -615,8 +617,9 @@ static void test_NtCreateKey(void) attr.Attributes = 0; pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine\\Software\\Classes" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - todo_wine - ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtCreateKey failed: 0x%08x\n", status ); + ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_SUCCESS /* Win10 1607+ */, + "NtCreateKey failed: 0x%08x\n", status ); + if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); @@ -926,14 +929,14 @@ static void test_NtQueryLicenseKey(void) len = 0xbeef; status = pNtQueryLicenseValue(&name, NULL, buffer, sizeof(buffer), &len); ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue returned %08x, expected STATUS_OBJECT_NAME_NOT_FOUND\n", status); - ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); + ok(len == 0xbeef || broken(!len) /* Win10 1607 */, "expected unmodified value for len, got %u\n", len); type = 0xdead; len = 0xbeef; status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), &len); ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue unexpected succeeded\n"); ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); - ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); + ok(len == 0xbeef || broken(!len) /* Win10 1607 */, "expected unmodified value for len, got %u\n", len); pRtlFreeUnicodeString(&name); @@ -1291,7 +1294,7 @@ static void test_symlinks(void) ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status ); attr.ObjectName = &link_str; status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); - ok( status == STATUS_SUCCESS || status == STATUS_OBJECT_NAME_NOT_FOUND, + ok( status == STATUS_OBJECT_NAME_NOT_FOUND || status == STATUS_OBJECT_NAME_INVALID /* Win10 1607+ */, "NtOpenKey wrong status 0x%08x\n", status ); key = (HKEY)0xdeadbeef; @@ -1320,8 +1323,10 @@ static void test_symlinks(void) ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status ); status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); - ok( status == STATUS_OBJECT_NAME_NOT_FOUND || status == STATUS_NAME_TOO_LONG, - "NtOpenKey failed: 0x%08x\n", status ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND /* XP */ + || status == STATUS_NAME_TOO_LONG + || status == STATUS_INVALID_PARAMETER /* Win10 1607+ */, + "NtOpenKey failed: 0x%08x\n", status ); attr.Attributes = OBJ_OPENLINK; status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr );

1 0

Zebediah Figura : quartz/tests: Skip the IVideoWindow tests if connecting returns E_FAIL.
by Alexandre Julliard 30 Dec '19

30 Dec '19

Module: wine Branch: master Commit: 2fe3b3a0e7091e301000cc207eefaa2092dcf007 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fe3b3a0e7091e301000cc20… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 27 11:50:33 2019 -0600 quartz/tests: Skip the IVideoWindow tests if connecting returns E_FAIL. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 241394277b..7d9cb22ec2 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2180,7 +2180,13 @@ static void test_video_window(void) testfilter_init(&source); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + if (hr == E_FAIL) + { + skip("Got E_FAIL when connecting.\n"); + goto out; + } ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMemInputPin_GetAllocator(input, &allocator); @@ -2215,8 +2221,6 @@ static void test_video_window(void) hr = IVideoWindow_GetMaxIdealImageSize(window, &width, &height); todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); - IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); - hr = IMediaControl_Pause(control); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -2237,6 +2241,7 @@ static void test_video_window(void) hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); +out: IMediaControl_Release(control); IFilterGraph2_Release(graph); IVideoWindow_Release(window);

1 0

Francois Gouget : user32/tests: Don't trace the test_topmost() window handles.
by Alexandre Julliard 30 Dec '19

30 Dec '19

Module: wine Branch: master Commit: 74ec06bee9be9c5ede6ce21a40b5ff031e82cb4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=74ec06bee9be9c5ede6ce21a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 30 00:09:47 2019 +0100 user32/tests: Don't trace the test_topmost() window handles. They change from one run to the next, causing the failures to always look new. Also for the topmost failures the window handle is irrelevant: all that matters is which window got the wrong results. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 278 ++++++++++++++++++++++++------------------------ 1 file changed, 139 insertions(+), 139 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=74ec06bee9be9c5ede6c…

1 0

Piotr Caban : msvcrt: Improve strtod precision.
by Alexandre Julliard 30 Dec '19

30 Dec '19

Module: wine Branch: master Commit: 5034d109e033fbe820829ae43adba0cc30bf9b99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5034d109e033fbe820829ae4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 30 13:23:47 2019 +0100 msvcrt: Improve strtod precision. This fixes strtod precision regression. It also removes floating point operations. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/string.c | 157 +++++++++++++++++++++++++++++-------------- dlls/ucrtbase/tests/string.c | 20 ++++-- 3 files changed, 123 insertions(+), 55 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index c333ddc62f..ee1a159385 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -53,6 +53,7 @@ #define MSVCRT_FLT_MIN_10_EXP (-37) #define MSVCRT_DBL_MAX_10_EXP 308 #define MSVCRT_DBL_MIN_10_EXP (-307) +#define MSVCRT_DBL_DIG 15 #ifdef _WIN64 #define MSVCRT_SIZE_MAX MSVCRT_UI64_MAX #else diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index ae1ec4c796..51730f6349 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -343,8 +343,6 @@ void CDECL MSVCRT__swab(char* src, char* dst, int len) } } -#if _MSVCR_VER >= 140 - enum round { ROUND_ZERO, /* only used when dropped part contains only zeros */ ROUND_DOWN, @@ -444,6 +442,8 @@ static double make_double(int sign, int exp, ULONGLONG m, enum round round, int return *((double*)&bits); } +#if _MSVCR_VER >= 140 + static inline int hex2int(char c) { if (c >= '0' && c <= '9') @@ -558,26 +558,105 @@ static double strtod16(int sign, const char *p, char **end, } #endif -static double MSVCRT_mul_pow10(double x, int exp) +struct u128 { + ULONGLONG u[2]; +}; + +static inline struct u128 u128_lshift(struct u128 *u) +{ + struct u128 r; + + r.u[0] = u->u[0] << 1; + r.u[1] = (u->u[1] << 1) + (u->u[0] >> (sizeof(u->u[0])*8-1)); + return r; +} + +static inline struct u128 u128_rshift(struct u128 *u) +{ + struct u128 r; + + r.u[0] = (u->u[0] >> 1) + ((u->u[1] & 1) << (sizeof(u->u[1])*8-1)); + r.u[1] = u->u[1] >> 1; + return r; +} + +static inline void u128_mul10(struct u128 *u) { - BOOL negexp = (exp < 0); - double ret; + struct u128 tmp; - if(negexp) - exp = -exp; - ret = pow(10.0, exp); - return (negexp ? x/ret : x*ret); + tmp = u128_lshift(u); + *u = u128_lshift(&tmp); + *u = u128_lshift(u); + + u->u[0] += tmp.u[0]; + u->u[1] += tmp.u[1]; + if (u->u[0] < tmp.u[0]) u->u[1]++; +} + +static inline void u128_div10(struct u128 *u) +{ + ULONGLONG h, l, r; + + r = u->u[1] % 10; + u->u[1] /= 10; + + h = (r << 32) + (u->u[0] >> 32); + r = h % 10; + h /= 10; + + l = (r << 32) + (u->u[0] & 0xffffffff); + l /= 10; + u->u[0] = (h << 32) + l; +} + +static double convert_e10_to_e2(int sign, int e10, ULONGLONG m, int *err) +{ + int e2 = 0; + struct u128 u128; + + u128.u[0] = m; + u128.u[1] = 0; + + while(e10 > 0) + { + u128_mul10(&u128); + e10--; + + while(u128.u[1] > MSVCRT_UI64_MAX/16) + { + u128 = u128_rshift(&u128); + e2++; + } + } + + while(e10 < 0) + { + while(!(u128.u[1] & (1 << (sizeof(u128.u[1])-1)))) + { + u128 = u128_lshift(&u128); + e2--; + } + + u128_div10(&u128); + e10++; + } + + while(u128.u[1]) + { + u128 = u128_rshift(&u128); + e2++; + } + + return make_double(sign, e2, u128.u[0], ROUND_DOWN, err); } static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale, int *err) { - int exp1=0, exp2=0, exp3=0, sign=1; MSVCRT_pthreadlocinfo locinfo; unsigned __int64 d=0, hlp; - BOOL found_digit = FALSE; - unsigned fpcontrol; + int exp=0, sign=1; const char *p; - double ret; + BOOL found_digit = FALSE; if(err) *err = 0; @@ -631,13 +710,13 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale found_digit = TRUE; hlp = d * 10 + *p++ - '0'; if(d>MSVCRT_UI64_MAX/10 || hlp<d) { - exp1++; + exp++; break; } else d = hlp; } while(*p>='0' && *p<='9') { - exp1++; + exp++; p++; } @@ -650,7 +729,7 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale if(d>MSVCRT_UI64_MAX/10 || hlp<d) break; d = hlp; - exp1--; + exp--; } while(*p>='0' && *p<='9') p++; @@ -679,9 +758,9 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale } e *= s; - if(exp1<0 && e<0 && exp1+e>=0) exp1 = INT_MIN; - else if(exp1>0 && e>0 && exp1+e<0) exp1 = INT_MAX; - else exp3 = e; + if(exp<0 && e<0 && exp+e>=0) exp = INT_MIN; + else if(exp>0 && e>0 && exp+e<0) exp = INT_MAX; + else exp += e; } else { if(*p=='-' || *p=='+') p--; @@ -689,39 +768,19 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale } } - fpcontrol = _control87(0, 0); - _control87(MSVCRT__EM_DENORMAL|MSVCRT__EM_INVALID|MSVCRT__EM_ZERODIVIDE - |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT|MSVCRT__PC_64, - MSVCRT__MCW_EM | MSVCRT__MCW_PC ); - - /* take the number without exponent and convert it into a double */ - ret = MSVCRT_mul_pow10(d, exp1); - /* shift the number to the representation where the first non-zero digit is in the ones place */ - exp2 = (ret != 0.0 ? (int)round(log10(ret)) : 0); - if (exp3-exp2 >= MSVCRT_FLT_MIN_10_EXP && exp3-exp2 <= MSVCRT_FLT_MAX_10_EXP) - exp2 = 0; /* only bother to take this extra step with very small or very large numbers */ - /* incorporate an additional shift to deal with floating point denormal values (if necessary) */ - if(exp3-exp2 < MSVCRT_DBL_MIN_10_EXP) - exp2 += exp3-exp2-MSVCRT_DBL_MIN_10_EXP; - ret = MSVCRT_mul_pow10(ret, exp2); - /* apply the exponent (and undo any shift) */ - ret = MSVCRT_mul_pow10(ret, exp3-exp2); - /* apply the sign bit */ - ret *= sign; - - _control87( fpcontrol, MSVCRT__MCW_EM | MSVCRT__MCW_PC ); - - if((d && ret==0.0) || isinf(ret)) { - if(err) - *err = MSVCRT_ERANGE; - else - *MSVCRT__errno() = MSVCRT_ERANGE; - } - if(end) *end = (char*)p; - return ret; + if(!err) err = MSVCRT__errno(); + if(!d) return make_double(sign, exp, d, ROUND_ZERO, err); + if(exp > MSVCRT_DBL_MAX_10_EXP) + return make_double(sign, INT_MAX, d, ROUND_ZERO, err); + /* Count part of exponent stored in denormalized mantissa. */ + /* Increase exponent range to handle subnormals. */ + if(exp < MSVCRT_DBL_MIN_10_EXP-MSVCRT_DBL_DIG-18) + return make_double(sign, INT_MIN, d, ROUND_ZERO, err); + + return convert_e10_to_e2(sign, exp, d, err); } /********************************************************************* diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index bfa602c538..0bb3feaa2f 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -118,16 +118,19 @@ static BOOL local_isnan(double d) return d != d; } -#define test_strtod_str(string, value, length) _test_strtod_str(__LINE__, string, value, length) -static void _test_strtod_str(int line, const char* string, double value, int length) +#define test_strtod_str(string, value, length) _test_strtod_str(__LINE__, string, value, length, FALSE) +#define test_strtod_str_todo(string, value, length) _test_strtod_str(__LINE__, string, value, length, TRUE) +static void _test_strtod_str(int line, const char* string, double value, int length, BOOL todo) { char *end; double d; d = p_strtod(string, &end); - if (local_isnan(value)) - ok_(__FILE__, line)(local_isnan(d), "d = %.16le (\"%s\")\n", d, string); - else - ok_(__FILE__, line)(d == value, "d = %.16le (\"%s\")\n", d, string); + todo_wine_if(todo) { + if (local_isnan(value)) + ok_(__FILE__, line)(local_isnan(d), "d = %.16le (\"%s\")\n", d, string); + else + ok_(__FILE__, line)(d == value, "d = %.16le (\"%s\")\n", d, string); + } ok_(__FILE__, line)(end == string + length, "incorrect end (%d, \"%s\")\n", (int)(end - string), string); } @@ -173,6 +176,11 @@ static void test_strtod(void) test_strtod_str("0x1ffffffffffffe.80000000000000000001", 9007199254740991.0, 37); test_strtod_str("0x1fffffffffffff.80000000000000000000", 9007199254740992.0, 37); test_strtod_str("0x1fffffffffffff.80000000000000000001", 9007199254740992.0, 37); + + test_strtod_str("4.0621786324484881721115322e-53", 4.0621786324484881721115322e-53, 31); + test_strtod_str_todo("1.8905590910042396899370942", 1.8905590910042396899370942, 27); + test_strtod_str("2.2250738585072014e-308", 2.2250738585072014e-308, 23); + test_strtod_str("4.9406564584124654e-324", 4.9406564584124654e-324, 23); } static void test__memicmp(void)

1 0

Francois Gouget : testbot/Janitor: Update the list of files to keep in latest/.
by Alexandre Julliard 30 Dec '19

30 Dec '19

Module: tools Branch: master Commit: f86ff23f0dcc6a92d688cc440e2a3a72c8ab95cc URL: https://source.winehq.org/git/tools.git/?a=commit;h=f86ff23f0dcc6a92d688cc4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 30 00:45:56 2019 +0100 testbot/Janitor: Update the list of files to keep in latest/. TestAgentd.exe and wine-parentsrc.txt were missing from the list, resulting in error messages in the log. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index c51637a..139faea 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -307,6 +307,13 @@ if (opendir(my $dh, "$DataDir/latest")) foreach my $Entry (@Entries) { next if ($Entry eq "." or $Entry eq ".."); + # Needed to analyze Wine patches + next if ($Entry eq "winefiles.txt" or $Entry eq "wine-parentsrc.txt"); + # Needed to update Windows VMs + next if ($Entry eq "TestAgentd.exe"); + # Needed to run the tests + next if ($Entry =~ /^TestLauncher[0-9]*\.exe$/); + next if ($Entry =~ /^winetest[0-9]*-latest\.exe$/); if ($Entry =~ /^([a-zA-Z0-9_]+)_(?:exe|win|wow)(?:32|64)[a-zA-Z0-9_]*\.report(?:\.err)?$/) { @@ -315,10 +322,6 @@ if (opendir(my $dh, "$DataDir/latest")) my $VMName = $1; next if ($AllVMs->GetItem($VMName)); } - elsif ($Entry =~ /^(?:TestLauncher[0-9]*\.exe|winefiles.txt|winetest[0-9]*-latest\.exe)$/) - { - next; - } Trace "Found a suspicious latest file: $Entry\n"; if ($JobPurgeDays != 0)

1 0

Francois Gouget : testbot/Janitor: Document where filenames are untainted.
by Alexandre Julliard 30 Dec '19

30 Dec '19

Module: tools Branch: master Commit: 6ee085bd0ee8fd68c72fc48db1f01b7a2b35cc03 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6ee085bd0ee8fd68c72fc48… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 30 00:46:13 2019 +0100 testbot/Janitor: Document where filenames are untainted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 139faea..35500e1 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -261,7 +261,7 @@ if (opendir(my $dh, "$DataDir/staging")) foreach my $Entry (@Entries) { next if ($Entry eq "." or $Entry eq ".."); - $Entry =~ m%^([^/]+)$%; + $Entry =~ m%^([^/]+)$%; # untaint my $FileName = "$DataDir/staging/$1"; my $Age = int((-M $FileName) + 0.5);

1 0

Francois Gouget : testbot/WineRun*: Trace the disconnection in all WineRun* scripts.
by Alexandre Julliard 30 Dec '19

30 Dec '19

Module: tools Branch: master Commit: 745856905b3482ebb2ee9937d1d6840eb75e4886 URL: https://source.winehq.org/git/tools.git/?a=commit;h=745856905b3482ebb2ee993… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 30 00:46:28 2019 +0100 testbot/WineRun*: Trace the disconnection in all WineRun* scripts. It was already present in WineRunWineTest. There is no reason for it to be the exception. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 2 ++ testbot/bin/WineRunReconfig.pl | 1 + testbot/bin/WineRunTask.pl | 2 ++ 3 files changed, 5 insertions(+) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index ccbba3b..f33b7bd 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -491,6 +491,8 @@ foreach my $TestInfo (values %{$Impacts->{Tests}}) } } } + +Debug(Elapsed($Start), " Disconnecting\n"); $TA->Disconnect(); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 5c63913..78abce3 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -507,6 +507,7 @@ if ($NewStatus eq "completed") } } +Debug(Elapsed($Start), " Disconnecting\n"); $TA->Disconnect(); diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index a324265..6a30de3 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -582,6 +582,8 @@ elsif (!defined $TAError) { $TAError = "An error occurred while retrieving $RptFileName: ". $TA->GetLastError(); } + +Debug(Elapsed($Start), " Disconnecting\n"); $TA->Disconnect();

1 0

Francois Gouget : testbot/LogUtils: Ignore the pid when comparing exception messages.
by Alexandre Julliard 30 Dec '19

30 Dec '19

Module: tools Branch: master Commit: 25dca3b6912806eb4b000637cc612497b13a70ea URL: https://source.winehq.org/git/tools.git/?a=commit;h=25dca3b6912806eb4b00063… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 30 04:09:05 2019 +0100 testbot/LogUtils: Ignore the pid when comparing exception messages. When the test framework detects and exception it includes the process id in the failure message to help diagnose if the failure happened in the main test process or one of its subprocesses. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index c577426..a3fa12b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -868,6 +868,8 @@ sub _GetLineKey($) # Remove the crash code address: it changes whenever the test is recompiled $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/; + # and the process id + $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8,16} at )[0-9a-fA-F]{8,16}$/$1/; # The exact amount of data printed does not change the error $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$[0-9]+ bytes$$/$1/;

1 0

Francois Gouget : testbot/LogUtils: Update the ParseTaskLog() Perl documentation.
by Alexandre Julliard 30 Dec '19

30 Dec '19

Module: tools Branch: master Commit: 7f41a625fa2cdbeb3377e7c652d0eaad7eb93e52 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7f41a625fa2cdbeb3377e7c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 30 04:09:15 2019 +0100 testbot/LogUtils: Update the ParseTaskLog() Perl documentation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index a3fa12b..1b9b1bf 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -78,6 +78,10 @@ Returns a hashtable containing a summary of the task log: =item Task Either 'ok' if the task was successful or a code indicating why it failed. +=item TestLauncher.exe... +Entries named after the binaries and files of interest to the TestBot that +have been updated. + =item NoLog Contains an error message if the task log could not be read.

1 0