February 2020 - Wine-commits

Francois Gouget : msvcrt/tests: Simplify the name of the test unit for child processes.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: c2e6f4deeb26429bc65078fa80b4c0aa19d3b764 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2e6f4deeb26429bc65078fa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 08:08:58 2020 +0100 msvcrt/tests: Simplify the name of the test unit for child processes. The official name (shown by --list) has no path nor extension. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 63d5100de2..0c4e024a8e 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1464,7 +1464,7 @@ static void test_file_inherit( const char* selfname ) fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY, _S_IREAD |_S_IWRITE); ok(fd != -1, "Couldn't create test file\n"); arg_v[0] = get_base_name(selfname); - arg_v[1] = "tests/file.c"; + arg_v[1] = "file"; arg_v[2] = "inherit"; arg_v[3] = buffer; sprintf(buffer, "%d", fd); arg_v[4] = 0; @@ -1477,7 +1477,7 @@ static void test_file_inherit( const char* selfname ) fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY | O_NOINHERIT, _S_IREAD |_S_IWRITE); ok(fd != -1, "Couldn't create test file\n"); - arg_v[1] = "tests/file.c"; + arg_v[1] = "file"; arg_v[2] = "inherit_no"; arg_v[3] = buffer; sprintf(buffer, "%d", fd); arg_v[4] = 0; @@ -2168,7 +2168,7 @@ static void test_pipes(const char* selfname) } arg_v[0] = get_base_name(selfname); - arg_v[1] = "tests/file.c"; + arg_v[1] = "file"; arg_v[2] = "pipes"; arg_v[3] = str_fdr; sprintf(str_fdr, "%d", pipes[0]); arg_v[4] = str_fdw; sprintf(str_fdw, "%d", pipes[1]); @@ -2197,7 +2197,7 @@ static void test_pipes(const char* selfname) return; } - arg_v[1] = "tests/file.c"; + arg_v[1] = "file"; arg_v[2] = "pipes"; arg_v[3] = str_fdr; sprintf(str_fdr, "%d", pipes[0]); arg_v[4] = str_fdw; sprintf(str_fdw, "%d", pipes[1]);

1 0

Francois Gouget : kernel32/tests: Simplify the name of the test unit for child processes.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: cd523f3049f8fdee9cca1cb0fa3ac749fad3cca7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd523f3049f8fdee9cca1cb0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 08:09:03 2020 +0100 kernel32/tests: Simplify the name of the test unit for child processes. The official name (shown by --list) has no path nor extension. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 68 +++++++++++++++++++++--------------------- dlls/kernel32/tests/toolhelp.c | 2 +- 2 files changed, 35 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cd523f3049f8fdee9cca…

1 0

Alexandre Julliard : winedump: Add dumping of normalization NLS files.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 3d55de8c73dc8b9de84c9e69a51cedb592407da5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d55de8c73dc8b9de84c9e69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 18 16:37:46 2020 +0100 winedump: Add dumping of normalization NLS files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/nls.c | 182 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 182 insertions(+) diff --git a/tools/winedump/nls.c b/tools/winedump/nls.c index ec42f86422..8966ceada9 100644 --- a/tools/winedump/nls.c +++ b/tools/winedump/nls.c @@ -165,6 +165,187 @@ static void dump_codepage(void) printf( "\n" ); } +struct norm_table +{ + WCHAR name[13]; /* 00 file name */ + USHORT checksum[3]; /* 1a checksum? */ + USHORT version[4]; /* 20 Unicode version */ + USHORT form; /* 28 normalization form */ + USHORT len_factor; /* 2a factor for length estimates */ + USHORT unknown1; /* 2c */ + USHORT decomp_size; /* 2e decomposition hash size */ + USHORT comp_size; /* 30 composition hash size */ + USHORT unknown2; /* 32 */ + USHORT classes; /* 34 combining classes table offset */ + USHORT props_level1; /* 36 char properties table level 1 offset */ + USHORT props_level2; /* 38 char properties table level 2 offset */ + USHORT decomp_hash; /* 3a decomposition hash table offset */ + USHORT decomp_map; /* 3c decomposition character map table offset */ + USHORT decomp_seq; /* 3e decomposition character sequences offset */ + USHORT comp_hash; /* 40 composition hash table offset */ + USHORT comp_seq; /* 42 composition character sequences offset */ +}; + +static int offset_scale = 1; /* older versions use byte offsets */ + +#define GET_TABLE(info,table) ((const void *)((const BYTE *)info + (info->table * offset_scale))) + +static unsigned int get_utf16( const WCHAR *str ) +{ + if (str[0] >= 0xd800 && str[0] <= 0xdbff && + str[1] >= 0xdc00 && str[1] <= 0xdfff) + return 0x10000 + ((str[0] & 0x3ff) << 10) + (str[1] & 0x3ff); + return str[0]; +} + +static BYTE rol( BYTE val, BYTE count ) +{ + return (val << count) | (val >> (8 - count)); +} + +static unsigned char get_char_props( const struct norm_table *info, unsigned int ch ) +{ + const BYTE *level1 = GET_TABLE( info, props_level1 ); + const BYTE *level2 = GET_TABLE( info, props_level2 ); + BYTE off = level1[ch / 128]; + + if (!off || off >= 0xfb) return rol( off, 5 ); + return level2[(off - 1) * 128 + ch % 128]; +} + +static const WCHAR *get_decomposition( const struct norm_table *info, + unsigned int ch, unsigned int *ret_len ) +{ + const USHORT *hash_table = GET_TABLE( info, decomp_hash ); + const WCHAR *seq = GET_TABLE(info, decomp_seq ); + const WCHAR *ret; + unsigned int i, pos, end, len, hash; + + *ret_len = 1 + (ch >= 0x10000); + if (!info->decomp_size) return NULL; + hash = ch % info->decomp_size; + pos = hash_table[hash]; + if (pos >> 13) + { + if (get_char_props( info, ch ) != 0xbf) return NULL; + ret = seq + (pos & 0x1fff); + len = pos >> 13; + } + else + { + const struct { WCHAR src; USHORT dst; } *pairs = GET_TABLE( info, decomp_map ); + + /* find the end of the hash bucket */ + for (i = hash + 1; i < info->decomp_size; i++) if (!(hash_table[i] >> 13)) break; + if (i < info->decomp_size) end = hash_table[i]; + else for (end = pos; pairs[end].src; end++) ; + + for ( ; pos < end; pos++) + { + if (pairs[pos].src != (WCHAR)ch) continue; + ret = seq + (pairs[pos].dst & 0x1fff); + len = pairs[pos].dst >> 13; + break; + } + if (pos >= end) return NULL; + } + + if (len == 7) while (ret[len]) len++; + *ret_len = len; + return ret; +} + +static int cmp_compos( const void *a, const void *b ) +{ + int ret = ((unsigned int *)a)[0] - ((unsigned int *)b)[0]; + if (!ret) ret = ((unsigned int *)a)[1] - ((unsigned int *)b)[1]; + return ret; +} + +static void dump_norm(void) +{ + const struct norm_table *info; + const BYTE *classes; + unsigned int i; + char name[13]; + + if (!(info = PRD( 0, sizeof(*info) ))) return; + for (i = 0; i < sizeof(name); i++) name[i] = info->name[i]; + printf( "Name: %s\n", name ); + switch (info->form) + { + case 1: printf( "Form: NFC\n" ); break; + case 2: printf( "Form: NFD\n" ); break; + case 5: printf( "Form: NFKC\n" ); break; + case 6: printf( "Form: NFKD\n" ); break; + case 13: printf( "Form: IDNA\n" ); break; + default: printf( "Form: %u\n", info->form ); break; + } + printf( "Version: %u.%u.%u\n", info->version[0], info->version[1], info->version[2] ); + printf( "Factor: %u\n", info->len_factor ); + + if (info->classes == sizeof(*info) / 2) offset_scale = 2; + classes = GET_TABLE( info, classes ); + + printf( "\nCharacter classes:\n" ); + for (i = 0; i < 0x110000; i++) + { + BYTE flags = get_char_props( info, i ); + + if (!(i % 16)) printf( "\n%06x:", i ); + if (!flags || (flags & 0x3f) == 0x3f) + { + static const char *flagstr[4] = { ".....", "Undef", "QC=No", "Inval" }; + printf( " %s", flagstr[flags >> 6] ); + } + else + { + static const char flagschar[4] = ".+*M"; + BYTE class = classes[flags & 0x3f]; + printf( " %c.%03u", flagschar[flags >> 6], class ); + } + } + + printf( "\n\nDecompositions:\n\n" ); + for (i = 0; i < 0x110000; i++) + { + unsigned int j, len; + const WCHAR *decomp = get_decomposition( info, i, &len ); + if (!decomp) continue; + printf( "%04x ->", i ); + for (j = 0; j < len; j++) + { + unsigned int ch = get_utf16( decomp + j ); + printf( " %04x", ch ); + if (ch >= 0x10000) j++; + } + printf( "\n" ); + } + if (info->comp_size) + { + unsigned int pos, len = (dump_total_len - info->comp_seq * offset_scale) / sizeof(WCHAR); + const WCHAR *seq = GET_TABLE( info, comp_seq ); + unsigned int *map = malloc( len * sizeof(*map) ); + + printf( "\nCompositions:\n\n" ); + + /* ignore hash table, simply dump all the sequences */ + for (i = pos = 0; i < len; pos += 3) + { + map[pos] = get_utf16( seq + i ); + i += 1 + (map[pos] >= 0x10000); + map[pos+1] = get_utf16( seq + i ); + i += 1 + (map[pos+1] >= 0x10000); + map[pos+2] = get_utf16( seq + i ); + i += 1 + (map[pos+2] >= 0x10000); + } + qsort( map, pos / 3, 3 * sizeof(*map), cmp_compos ); + for (i = 0; i < pos; i += 3) printf( "%04x %04x -> %04x\n", map[i], map[i + 1], map[i + 2] ); + free( map ); + } + printf( "\n" ); +} + void nls_dump(void) { const char *name = strrchr( globals.input_name, '/' ); @@ -172,6 +353,7 @@ void nls_dump(void) else name = globals.input_name; if (!strcasecmp( name, "l_intl.nls" )) return dump_casemap(); if (!strncasecmp( name, "c_", 2 )) return dump_codepage(); + if (!strncasecmp( name, "norm", 4 )) return dump_norm(); fprintf( stderr, "Unrecognized file name '%s'\n", globals.input_name ); }

1 0

Alexandre Julliard : unicode: Generate the NLS files for normalization forms.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: f9f3e57cf8cb720f04c5e7134a7f123df09123d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9f3e57cf8cb720f04c5e713… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 18 11:26:21 2020 +0100 unicode: Generate the NLS files for normalization forms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 4 +- loader/wine.inf.in | 5 + nls/Makefile.in | 7 +- nls/normidna.nls | Bin 0 -> 82058 bytes nls/normnfc.nls | Bin 0 -> 57630 bytes nls/normnfd.nls | Bin 0 -> 50942 bytes nls/normnfkc.nls | Bin 0 -> 79052 bytes nls/normnfkd.nls | Bin 0 -> 72684 bytes tools/make_unicode | 378 ++++++++++++++++++++++++++++++++++++++++++- 9 files changed, 383 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f9f3e57cf8cb720f04c5…

1 0

Alexandre Julliard : ntdll: Use external NLS files for Unicode normalization.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 64dc42e34ffb0178fd9679359f41d09fca76d5df URL: https://source.winehq.org/git/wine.git/?a=commit;h=64dc42e34ffb0178fd967935… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 18 20:05:03 2020 +0100 ntdll: Use external NLS files for Unicode normalization. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 4 - dlls/ntdll/locale.c | 350 ++++++++++++++++++++++++++++++------------- 2 files changed, 250 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=64dc42e34ffb0178fd96…

1 0

Alexandre Julliard : kernelbase: Use external NLS files for Unicode composition.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 55dc4fce990f9edd3c216e5dff15a7918308b03f URL: https://source.winehq.org/git/wine.git/?a=commit;h=55dc4fce990f9edd3c216e5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 20 16:02:36 2020 +0100 kernelbase: Use external NLS files for Unicode composition. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 128 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 115 insertions(+), 13 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 8e878981ba..aad2422db2 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -42,11 +42,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(nls); #define CALINFO_MAX_YEAR 2029 extern UINT CDECL __wine_get_unix_codepage(void); -extern unsigned int wine_compose( unsigned int ch1, unsigned int ch2 ) DECLSPEC_HIDDEN; extern const unsigned short wctype_table[] DECLSPEC_HIDDEN; extern const unsigned int collation_table[] DECLSPEC_HIDDEN; -extern const unsigned short nfd_table[] DECLSPEC_HIDDEN; static HANDLE kernel32_handle; @@ -538,6 +536,36 @@ static const struct geoinfo geoinfodata[] = { 161832257, L"XX", L"XX", 10026358, 419, LOCATION_REGION }, /* Latin America and the Caribbean */ }; +/* NLS normalization file */ +struct norm_table +{ + WCHAR name[13]; /* 00 file name */ + USHORT checksum[3]; /* 1a checksum? */ + USHORT version[4]; /* 20 Unicode version */ + USHORT form; /* 28 normalization form */ + USHORT len_factor; /* 2a factor for length estimates */ + USHORT unknown1; /* 2c */ + USHORT decomp_size; /* 2e decomposition hash size */ + USHORT comp_size; /* 30 composition hash size */ + USHORT unknown2; /* 32 */ + USHORT classes; /* 34 combining classes table offset */ + USHORT props_level1; /* 36 char properties table level 1 offset */ + USHORT props_level2; /* 38 char properties table level 2 offset */ + USHORT decomp_hash; /* 3a decomposition hash table offset */ + USHORT decomp_map; /* 3c decomposition character map table offset */ + USHORT decomp_seq; /* 3e decomposition character sequences offset */ + USHORT comp_hash; /* 40 composition hash table offset */ + USHORT comp_seq; /* 42 composition character sequences offset */ + /* BYTE[] combining class values */ + /* BYTE[0x2200] char properties index level 1 */ + /* BYTE[] char properties index level 2 */ + /* WORD[] decomposition hash table */ + /* WORD[] decomposition character map */ + /* WORD[] decomposition character sequences */ + /* WORD[] composition hash table */ + /* WORD[] composition character sequences */ +}; + static NLSTABLEINFO nls_info; static UINT mac_cp = 10000; static HKEY intl_key; @@ -547,6 +575,8 @@ static HKEY tz_key; static CPTABLEINFO codepages[128]; static unsigned int nb_codepages; +static struct norm_table *norm_info; + static CRITICAL_SECTION locale_section; static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -581,6 +611,8 @@ void init_locale(void) (WCHAR *)&oem_cp, sizeof(oem_cp)/sizeof(WCHAR) ); NtGetNlsSectionPtr( 10, 0, 0, (void **)&casemap_ptr, &size ); + NtGetNlsSectionPtr( 12, NormalizationC, NULL, (void **)&norm_info, &size ); + if (!ansi_cp || NtGetNlsSectionPtr( 11, ansi_cp, NULL, (void **)&ansi_ptr, &size )) NtGetNlsSectionPtr( 11, 1252, NULL, (void **)&ansi_ptr, &size ); if (!oem_cp || NtGetNlsSectionPtr( 11, oem_cp, 0, (void **)&oem_ptr, &size )) @@ -675,15 +707,85 @@ static inline WCHAR casemap( const USHORT *table, WCHAR ch ) } -static const WCHAR *get_decomposition( WCHAR ch, unsigned int *len ) +static BYTE rol( BYTE val, BYTE count ) { - unsigned short offset = nfd_table[nfd_table[ch >> 8] + ((ch >> 4) & 0xf)] + (ch & 0xf); - unsigned short start = nfd_table[offset]; - unsigned short end = nfd_table[offset + 1]; + return (val << count) | (val >> (8 - count)); +} - if ((*len = end - start)) return nfd_table + start; - *len = 1; - return NULL; + +static BYTE get_char_props( const struct norm_table *info, unsigned int ch ) +{ + const BYTE *level1 = (const BYTE *)((const USHORT *)info + info->props_level1); + const BYTE *level2 = (const BYTE *)((const USHORT *)info + info->props_level2); + BYTE off = level1[ch / 128]; + + if (!off || off >= 0xfb) return rol( off, 5 ); + return level2[(off - 1) * 128 + ch % 128]; +} + + +static const WCHAR *get_decomposition( WCHAR ch, unsigned int *ret_len ) +{ + const struct pair { WCHAR src; USHORT dst; } *pairs; + const USHORT *hash_table = (const USHORT *)norm_info + norm_info->decomp_hash; + const WCHAR *ret; + unsigned int i, pos, end, len, hash; + + *ret_len = 1; + hash = ch % norm_info->decomp_size; + pos = hash_table[hash]; + if (pos >> 13) + { + if (get_char_props( norm_info, ch ) != 0xbf) return NULL; + ret = (const USHORT *)norm_info + norm_info->decomp_seq + (pos & 0x1fff); + len = pos >> 13; + } + else + { + pairs = (const struct pair *)((const USHORT *)norm_info + norm_info->decomp_map); + + /* find the end of the hash bucket */ + for (i = hash + 1; i < norm_info->decomp_size; i++) if (!(hash_table[i] >> 13)) break; + if (i < norm_info->decomp_size) end = hash_table[i]; + else for (end = pos; pairs[end].src; end++) ; + + for ( ; pos < end; pos++) + { + if (pairs[pos].src != (WCHAR)ch) continue; + ret = (const USHORT *)norm_info + norm_info->decomp_seq + (pairs[pos].dst & 0x1fff); + len = pairs[pos].dst >> 13; + break; + } + if (pos >= end) return NULL; + } + + if (len == 7) while (ret[len]) len++; + if (!ret[0]) len = 0; /* ignored char */ + *ret_len = len; + return ret; +} + + +static WCHAR compose_chars( WCHAR ch1, WCHAR ch2 ) +{ + const USHORT *table = (const USHORT *)norm_info + norm_info->comp_hash; + const WCHAR *chars = (const USHORT *)norm_info + norm_info->comp_seq; + unsigned int hash, start, end, i; + WCHAR ch[3]; + + hash = (ch1 + 95 * ch2) % norm_info->comp_size; + start = table[hash]; + end = table[hash + 1]; + while (start < end) + { + for (i = 0; i < 3; i++, start++) + { + ch[i] = chars[start]; + if (IS_HIGH_SURROGATE( ch[i] )) start++; + } + if (ch[0] == ch1 && ch[1] == ch2) return ch[2]; + } + return 0; } @@ -1673,7 +1775,7 @@ static int wcstombs_sbcs_slow( const CPTABLEINFO *info, DWORD flags, const WCHAR for (i = 0; srclen; i++, src++, srclen--) { wch = *src; - if ((flags & WC_COMPOSITECHECK) && (srclen > 1) && (composed = wine_compose( src[0], src[1] ))) + if ((flags & WC_COMPOSITECHECK) && (srclen > 1) && (composed = compose_chars( src[0], src[1] ))) { /* now check if we can use the composed char */ if (is_valid_sbcs_mapping( info, flags, composed )) @@ -1706,7 +1808,7 @@ static int wcstombs_sbcs_slow( const CPTABLEINFO *info, DWORD flags, const WCHAR for (i = dstlen; srclen && i; dst++, i--, src++, srclen--) { wch = *src; - if ((flags & WC_COMPOSITECHECK) && (srclen > 1) && (composed = wine_compose( src[0], src[1] ))) + if ((flags & WC_COMPOSITECHECK) && (srclen > 1) && (composed = compose_chars( src[0], src[1] ))) { /* now check if we can use the composed char */ if (is_valid_sbcs_mapping( info, flags, composed )) @@ -1776,7 +1878,7 @@ static int wcstombs_dbcs_slow( const CPTABLEINFO *info, DWORD flags, const WCHAR for (i = 0; srclen; srclen--, src++, i++) { wch = *src; - if ((flags & WC_COMPOSITECHECK) && (srclen > 1) && (composed = wine_compose( src[0], src[1] ))) + if ((flags & WC_COMPOSITECHECK) && (srclen > 1) && (composed = compose_chars( src[0], src[1] ))) { /* now check if we can use the composed char */ if (is_valid_dbcs_mapping( info, flags, composed )) @@ -1820,7 +1922,7 @@ static int wcstombs_dbcs_slow( const CPTABLEINFO *info, DWORD flags, const WCHAR for (i = dstlen; srclen && i; i--, srclen--, src++) { wch = *src; - if ((flags & WC_COMPOSITECHECK) && (srclen > 1) && (composed = wine_compose( src[0], src[1] ))) + if ((flags & WC_COMPOSITECHECK) && (srclen > 1) && (composed = compose_chars( src[0], src[1] ))) { /* now check if we can use the composed char */ if (is_valid_dbcs_mapping( info, flags, composed ))

1 0

Francois Gouget : testbot/LogUtils: The done lines always contain timing information.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: tools Branch: master Commit: a7914bbc8ec49e8d71e6ab66aae806a0eac849f4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a7914bbc8ec49e8d71e6ab6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 03:02:41 2020 +0100 testbot/LogUtils: The done lines always contain timing information. Both WineTest and TestLauncher have been using the new format for quite some time so support for the old one can be dropped. 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, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index a95eeca..18ebe93 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -648,8 +648,8 @@ sub ParseWineTestReport($$$) } } elsif (($Cur->{Dll} ne "" and - $Line =~ /(\Q$Cur->{Dll}\E):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/) or - $Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/) + $Line =~ /(\Q$Cur->{Dll}\E):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$ in /) or + $Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$ in /) { my ($Dll, $Unit, $Pid, $Rc) = ($1, $2, $3, $4);

1 0

Francois Gouget : winetest/dissect: The done lines always contain timing information.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: tools Branch: master Commit: 6bcbb9bd44c8f7ad18bb1a1f5d2f1ef5498ec73a URL: https://source.winehq.org/git/tools.git/?a=commit;h=6bcbb9bd44c8f7ad18bb1a1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 03:02:26 2020 +0100 winetest/dissect: The done lines always contain timing information. Both WineTest and TestLauncher have been using the new format for quite some time so support for the old one can be dropped. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 6c6c594..ca8648a 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -710,8 +710,8 @@ while ($line = <IN>) { } } elsif (($dll ne "" and - $line =~ /(\Q$dll\E):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/) or - $line =~ /^([_.a-z0-9-]+):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/) + $line =~ /(\Q$dll\E):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$ in /) or + $line =~ /^([_.a-z0-9-]+):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$ in /) { my ($l_dll, $l_unit, $l_pid, $l_rc) = ($1, $2, $3, $4);

1 0

Francois Gouget : testbot/LogUtils: Simplify a couple of regular expressions.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: tools Branch: master Commit: 455f0160ccedaef1ffc246a7fbbf7052f9ed5808 URL: https://source.winehq.org/git/tools.git/?a=commit;h=455f0160ccedaef1ffc246a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 03:03:12 2020 +0100 testbot/LogUtils: Simplify a couple of regular expressions. 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, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 18ebe93..2d4e4ee 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -102,7 +102,7 @@ sub GetLogLineCategory($) $Line =~ /: error: / or $Line =~ /: undefined reference to `/ or $Line =~ /^make: [*]{3} No rule to make target / or - $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or + $Line =~ /^Makefile:\d+: recipe for target .* failed$/ or $Line =~ /^Task: / or # Typical perl errors _IsPerlError($Line) or @@ -1048,7 +1048,7 @@ sub _GetLineKey($) $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/; + $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$\d+ bytes$$/$1/; # Note: The 'done (258)' lines are modified by ParseWineTestReport() and # no longer contain the pid. So they need no further change here.

1 0

Francois Gouget : testbot/LogUtils: The exception codes are always 32 bit.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: tools Branch: master Commit: c80db6335fb2383cec0c49e875bbff231619c857 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c80db6335fb2383cec0c49e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 03:01:04 2020 +0100 testbot/LogUtils: The exception codes are always 32 bit. Only the addresses may be 64 bit. 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, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 2d4e4ee..734d322 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1045,7 +1045,7 @@ 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/; + $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8} 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 )$\d+ bytes$$/$1/;

1 0