April 2022 - Wine-Commits - list.winehq.org

Huw Davies : winedbg: Accept "continue".
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: 86a075a0273c259215bec35523607a23eb075992 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86a075a0273c259215bec355… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 25 10:29:54 2022 +0100 winedbg: Accept "continue". Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debug.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 280013799c9..23073dd4c65 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -182,7 +182,7 @@ STRING \"(\\[^\n]|[^\\"\n])*\" <INITIAL,NOPROCESS>backtrace|backtrac|backtra|backt|back|bac|ba|bt { BEGIN(NOCMD); return tBACKTRACE; } <INITIAL,NOPROCESS>where|wher|whe { BEGIN(NOCMD); return tBACKTRACE; } -<INITIAL>cont|con|co|c { BEGIN(NOCMD); return tCONT; } +<INITIAL>continue|continu|contin|conti|cont|con|co|c { BEGIN(NOCMD); return tCONT; } <INITIAL>pass|pas|pa { BEGIN(NOCMD); return tPASS; } <INITIAL>condition|conditio|conditi|condit|condi|cond { BEGIN(NOCMD); return tCOND; } <INITIAL>step|ste|st|s { BEGIN(NOCMD); return tSTEP; }

1 0

Alexandre Julliard : make_unicode: Generate the character mapping tables in locale.nls.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: 9e6d0e459ff153dd62cda5000be487fd714c3957 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e6d0e459ff153dd62cda500… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 25 11:52:14 2022 +0200 make_unicode: Generate the character mapping tables in locale.nls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- nls/locale.nls | Bin 664228 -> 730526 bytes tools/make_unicode | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 81 insertions(+), 3 deletions(-) diff --git a/nls/locale.nls b/nls/locale.nls index 2ab7ce55dc9..329224c92fc 100644 Binary files a/nls/locale.nls and b/nls/locale.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index 520cbe0f1a5..f697eeaaeb4 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -26,6 +26,7 @@ use Encode; # base URLs for www.unicode.org files my $UNIVERSION = "14.0.0"; my $UNIDATA = "https://www.unicode.org/Public/$UNIVERSION/ucd/UCD.zip"; +my $UNIHAN = "https://www.unicode.org/Public/$UNIVERSION/ucd/Unihan.zip"; my $IDNADATA = "https://www.unicode.org/Public/idna/$UNIVERSION"; my $JISDATA = "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS"; my $KSCDATA = "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/KSC"; @@ -1825,6 +1826,11 @@ my @uni2cp = (); my @tolower_table = (); my @toupper_table = (); my @digitmap_table = (); +my @halfwidth_table = (); +my @fullwidth_table = (); +my @cjk_compat_table = (); +my @chinese_traditional_table = (); +my @chinese_simplified_table = (); my @category_table = (); my @initial_joining_table = (); my @direction_table = (); @@ -2106,7 +2112,18 @@ sub load_data() $decomp_compat_table[$src] = \@seq; } - if ($decomp =~ /^<([a-zA-Z]+)>\s+([0-9a-fA-F]+)$/) + if ($decomp =~ /^<narrow>\s+([0-9a-fA-F]+)$/) + { + $halfwidth_table[hex $1] = $src; + $fullwidth_table[$src] = hex $1; + } + elsif ($decomp =~ /^<wide>\s+([0-9a-fA-F]+)$/) + { + next if hex $1 == 0x5c; # don't remap backslash + $fullwidth_table[hex $1] = $src; + $halfwidth_table[$src] = hex $1; + } + elsif ($decomp =~ /^<([a-zA-Z]+)>\s+([0-9a-fA-F]+)$/) { # decomposition of the form "<foo> 1234" -> use char if type is known if ($1 eq "isolated" || $1 eq "final" || $1 eq "initial" || $1 eq "medial") @@ -2127,8 +2144,10 @@ sub load_data() } elsif ($decomp =~ /^([0-9a-fA-F]+)$/) { + my $dst = hex $1; # Single char decomposition - $decomp_table[$src] = $decomp_compat_table[$src] = [ hex $1 ]; + $decomp_table[$src] = $decomp_compat_table[$src] = [ $dst ]; + $cjk_compat_table[$src] = $dst if $name =~ /^CJK COMPATIBILITY IDEOGRAPH/; } } } @@ -2213,6 +2232,24 @@ sub load_data() } } close $IDNA; + + # load the Unihan mappings + + my $UNIHAN = open_data_file( $UNIHAN, "Unihan_Variants.txt" ); + while (<$UNIHAN>) + { + s/\#.*//; # remove comments + next if /^\s*$/; + if (/^U\+([0-9a-fA-F]+)\s+kTraditionalVariant\s+U\+([0-9a-fA-F]+)/) + { + $chinese_traditional_table[hex $1] = hex $2; + } + elsif (/^U\+([0-9a-fA-F]+)\s+kSimplifiedVariant\s+U\+([0-9a-fA-F]+)/) + { + $chinese_simplified_table[hex $1] = hex $2; + } + } + close $UNIHAN; } @@ -5179,6 +5216,47 @@ sub build_locale_data() } +################################################################ +# build the charmaps table for locale.nls +sub build_charmaps_data() +{ + my $data = ""; + + # MAP_FOLDDIGITS + $data .= dump_binary_case_table( @digitmap_table ); + + # CJK compatibility map + $data .= dump_binary_case_table( @cjk_compat_table ); + + # LCMAP_HIRAGANA/KATAKANA + my (@hiragana_table, @katakana_table); + foreach my $ch (0x3041..0x3096, 0x309d..0x309e) + { + $hiragana_table[$ch + 0x60] = $ch; + $katakana_table[$ch] = $ch + 0x60; + } + $data .= dump_binary_case_table( @hiragana_table ) . dump_binary_case_table( @katakana_table ); + + # LCMAP_HALFWIDTH/FULLWIDTH + $halfwidth_table[0x2018] = 0x0027; + $halfwidth_table[0x2019] = 0x0027; + $halfwidth_table[0x201c] = 0x0022; + $halfwidth_table[0x201d] = 0x0022; + $halfwidth_table[0x309b] = 0xff9e; + $halfwidth_table[0x309c] = 0xff9f; + $fullwidth_table[0x309b] = 0x3099; + $fullwidth_table[0x309c] = 0x309a; + $data .= dump_binary_case_table( @halfwidth_table ) . dump_binary_case_table( @fullwidth_table ); + + # LCMAP_TRADITIONAL/SIMPLIFIED_CHINESE + $data .= dump_binary_case_table( @chinese_traditional_table ) . dump_binary_case_table( @chinese_simplified_table ); + + # FIXME: some more unknown tables here + + return $data; +} + + ################################################################ # build the geoids table for locale.nls sub build_geoids_data() @@ -5237,7 +5315,7 @@ sub dump_locales($$) printf "Building $filename\n"; my $locale_data = build_locale_data(); - my $charmaps_data = ""; # FIXME + my $charmaps_data = build_charmaps_data(); my $geoids_data = build_geoids_data(); my $scripts_data = ""; # FIXME

1 0

Alexandre Julliard : kernelbase: Use the mapping tables from locale.nls in LCMapStringEx().
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: ccbb341a8c08509c1f91015bcff5167822c91f79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccbb341a8c08509c1f91015b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 25 11:53:46 2022 +0200 kernelbase: Use the mapping tables from locale.nls in LCMapStringEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 232 ++++++++++++----------------------------------- 1 file changed, 56 insertions(+), 176 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ccbb341a8c08509c1f91…

1 0

Alexandre Julliard : kernelbase: Use the digit table from locale.nls in FoldStringW().
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: f3b77b802709ac590f88a85dc1b85d45d00fdb59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3b77b802709ac590f88a85d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 25 11:53:53 2022 +0200 kernelbase: Use the digit table from locale.nls in FoldStringW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 1 - dlls/kernelbase/digitmap.c | 91 --------------------------------------------- dlls/kernelbase/locale.c | 13 +------ tools/make_unicode | 19 ---------- 4 files changed, 1 insertion(+), 123 deletions(-) diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in index a5845abc1a8..2b270153060 100644 --- a/dlls/kernelbase/Makefile.in +++ b/dlls/kernelbase/Makefile.in @@ -9,7 +9,6 @@ C_SRCS = \ collation.c \ console.c \ debug.c \ - digitmap.c \ file.c \ loader.c \ locale.c \ diff --git a/dlls/kernelbase/digitmap.c b/dlls/kernelbase/digitmap.c deleted file mode 100644 index 26a464e30f5..00000000000 --- a/dlls/kernelbase/digitmap.c +++ /dev/null @@ -1,91 +0,0 @@ -/* Unicode digit folding mappings */ -/* generated from https://www.unicode.org/Public/14.0.0/ucd/UCD.zip:UnicodeData.txt */ -/* DO NOT EDIT!! */ - -#include "windef.h" - -const unsigned short DECLSPEC_HIDDEN wine_digitmap[619] = -{ - /* level 1 offsets */ - 0x0100, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x0116, 0x0110, - 0x010c, 0x0126, 0x0126, 0x0126, 0x0126, 0x0126, 0x0135, 0x0140, - 0x014c, 0x010c, 0x010c, 0x0156, 0x010c, 0x010c, 0x010c, 0x010e, - 0x0165, 0x0171, 0x017f, 0x018a, 0x0196, 0x010c, 0x010c, 0x010c, - 0x019f, 0x010c, 0x010c, 0x010c, 0x01a9, 0x010c, 0x010c, 0x01b9, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x0140, 0x010c, - 0x010f, 0x01c9, 0x013d, 0x010d, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, - 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x0165, - /* level 2 offsets */ - 0x01d9, 0x01d9, 0x01d9, 0x01e9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, - 0x01d9, 0x01d9, 0x01d9, 0x01f7, 0x01d9, 0x01d9, 0x01d9, 0x01d9, - 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, - 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01e9, 0x01d9, 0x01d9, 0x01d9, - 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01e9, 0x01d9, 0x01d9, - 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01e3, 0x01d9, 0x01d9, 0x01d9, - 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01e3, 0x01d9, 0x01d9, 0x01d9, - 0x01d9, 0x01d9, 0x01e9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, - 0x01d9, 0x01d9, 0x01e9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, - 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, - 0x01e9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01e9, 0x01d9, 0x01d9, - 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x0201, 0x0211, 0x01d9, 0x01d9, - 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01e9, 0x01d9, - 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, - 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01e3, 0x01d9, 0x01d9, - 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x0221, 0x01d9, - 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01e9, - 0x01e9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01e9, - 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01e9, 0x01d9, 0x01d9, - 0x01d9, 0x01d9, 0x01e9, 0x01e9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, - 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x0231, 0x01e9, - 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x020a, - 0x0206, 0x0202, 0x023a, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x0240, - 0x024b, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, - 0x0204, 0x025b, 0x0210, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, - 0x01d9, 0x01e9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, - 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01d9, 0x01e9, 0x01d9, - 0x01e9, - /* values */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0032, 0x0033, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0031, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x0031, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0030, 0x0000, 0x0000, 0x0000, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0030, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0031, - 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, - 0x0000, 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, - 0x0037, 0x0038, 0x0039, 0x0000, 0x0031, 0x0032, 0x0033, 0x0034, - 0x0035, 0x0036 -}; diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 3830a3fae2c..d046cefd749 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1856,12 +1856,6 @@ void init_locale( HMODULE module ) } -static inline USHORT get_table_entry( const USHORT *table, WCHAR ch ) -{ - return table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0xf)]; -} - - static inline WCHAR casemap( const USHORT *table, WCHAR ch ) { return ch + table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0x0f)]; @@ -2072,17 +2066,12 @@ static NTSTATUS expand_ligatures( const WCHAR *src, int srclen, WCHAR *dst, int static NTSTATUS fold_digits( const WCHAR *src, int srclen, WCHAR *dst, int *dstlen ) { - extern const WCHAR wine_digitmap[] DECLSPEC_HIDDEN; int i, len = *dstlen; *dstlen = srclen; if (!len) return STATUS_SUCCESS; if (srclen > len) return STATUS_BUFFER_TOO_SMALL; - for (i = 0; i < srclen; i++) - { - WCHAR digit = get_table_entry( wine_digitmap, src[i] ); - dst[i] = digit ? digit : src[i]; - } + for (i = 0; i < srclen; i++) dst[i] = casemap( charmaps[CHARMAP_FOLDDIGITS], src[i] ); return STATUS_SUCCESS; } diff --git a/tools/make_unicode b/tools/make_unicode index f697eeaaeb4..29dea8cd52e 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -3253,24 +3253,6 @@ sub dump_vertical($$) save_file($filename); } -################################################################ -# dump the digit folding tables -sub dump_digit_folding($) -{ - my ($filename) = shift; - open OUTPUT,">$filename.new" or die "Cannot create $filename"; - print "Building $filename\n"; - print OUTPUT "/* Unicode digit folding mappings */\n"; - print OUTPUT "/* generated from $UNIDATA:UnicodeData.txt */\n"; - print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"windef.h\"\n\n"; - - dump_two_level_mapping( "wine_digitmap", 0, 16, @digitmap_table ); - close OUTPUT; - save_file($filename); -} - - ################################################################ # compress a mapping table by removing identical rows sub compress_array($$@) @@ -5393,7 +5375,6 @@ load_data(); dump_sortkeys( "dlls/kernelbase/collation.c" ); dump_bidi_dir_table( "dlls/gdi32/uniscribe/direction.c" ); dump_bidi_dir_table( "dlls/dwrite/direction.c" ); -dump_digit_folding( "dlls/kernelbase/digitmap.c" ); dump_mirroring( "dlls/gdi32/uniscribe/mirror.c" ); dump_mirroring( "dlls/dwrite/mirror.c" ); dump_bracket( "dlls/gdi32/uniscribe/bracket.c" );

1 0

Rémi Bernon : kernel32/tests: Add some heap block layout tests.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: 3757a8f1ab78955dc328f4a79231eba913ed4573 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3757a8f1ab78955dc328f4a7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 20 12:07:59 2022 +0200 kernel32/tests: Add some heap block layout tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 123 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 104eced3bf4..302c0542f90 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -37,6 +37,9 @@ #define HEAP_VALIDATE_ALL 0x20000000 #define HEAP_VALIDATE_PARAMS 0x40000000 +#define BLOCK_ALIGN (2 * sizeof(void *) - 1) +#define ALIGN_BLOCK_SIZE(x) (((x) + BLOCK_ALIGN) & ~BLOCK_ALIGN) + /* use function pointers to avoid warnings for invalid parameter tests */ static LPVOID (WINAPI *pHeapAlloc)(HANDLE,DWORD,SIZE_T); static LPVOID (WINAPI *pHeapReAlloc)(HANDLE,DWORD,LPVOID,SIZE_T); @@ -1729,6 +1732,125 @@ static void test_LocalAlloc(void) } } +static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags ) +{ + DWORD padd_flags = HEAP_VALIDATE | HEAP_VALIDATE_ALL | HEAP_VALIDATE_PARAMS; + SIZE_T expect_size, alloc_size, extra_size, tail_size = 0; + unsigned char *ptr0, *ptr1, *ptr2; + char tail_buf[64]; + BOOL ret; + + if (global_flags & (FLG_HEAP_DISABLE_COALESCING|FLG_HEAP_PAGE_ALLOCS|FLG_POOL_ENABLE_TAGGING| + FLG_HEAP_ENABLE_TAGGING|FLG_HEAP_ENABLE_TAG_BY_DLL)) + { + skip( "skipping not yet implemented block layout tests\n" ); + return; + } + + if (!global_flags) extra_size = 8; + else extra_size = 2 * sizeof(void *); + if (heap_flags & HEAP_TAIL_CHECKING_ENABLED) extra_size += 2 * sizeof(void *); + if (heap_flags & padd_flags) extra_size += 2 * sizeof(void *); + + if ((heap_flags & HEAP_TAIL_CHECKING_ENABLED)) tail_size = 2 * sizeof(void *); + memset( tail_buf, 0xab, sizeof(tail_buf) ); + + for (alloc_size = 0x20000 * sizeof(void *) - 0x3000; alloc_size > 0; alloc_size >>= 1) + { + winetest_push_context( "size %#Ix", alloc_size ); + + ptr0 = pHeapAlloc( heap, HEAP_ZERO_MEMORY, alloc_size ); + ok( !!ptr0, "HeapAlloc failed, error %lu\n", GetLastError() ); + ptr1 = pHeapAlloc( heap, HEAP_ZERO_MEMORY, alloc_size ); + ok( !!ptr1, "HeapAlloc failed, error %lu\n", GetLastError() ); + ptr2 = pHeapAlloc( heap, HEAP_ZERO_MEMORY, alloc_size ); + ok( !!ptr2, "HeapAlloc failed, error %lu\n", GetLastError() ); + + ok( !((UINT_PTR)ptr0 & (2 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); + ok( !((UINT_PTR)ptr1 & (2 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); + ok( !((UINT_PTR)ptr2 & (2 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); + + expect_size = max( alloc_size, 2 * sizeof(void *) ); + expect_size = ALIGN_BLOCK_SIZE( expect_size + extra_size ); + todo_wine_if( heap_flags & (HEAP_VALIDATE_PARAMS|HEAP_VALIDATE_ALL) || + min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ) != expect_size ) + ok( min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ) == expect_size, "got diff %#I64x\n", + min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ) ); + + ok( !memcmp( ptr0 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); + ok( !memcmp( ptr1 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); + ok( !memcmp( ptr2 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); + + ret = HeapFree( heap, 0, ptr2 ); + ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + ret = HeapFree( heap, 0, ptr1 ); + ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + ret = HeapFree( heap, 0, ptr0 ); + ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + + winetest_pop_context(); + } + + + /* between the two thesholds, tail may still be set but block position is inconsistent */ + + alloc_size = 0x20000 * sizeof(void *) - 0x2000; + winetest_push_context( "size %#Ix", alloc_size ); + + ptr0 = pHeapAlloc( heap, HEAP_ZERO_MEMORY, alloc_size ); + ok( !!ptr0, "HeapAlloc failed, error %lu\n", GetLastError() ); + ok( !((UINT_PTR)ptr0 & (2 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); + + ok( !memcmp( ptr0 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); + + ret = HeapFree( heap, 0, ptr0 ); + ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + + winetest_pop_context(); + + + for (alloc_size = 0x20000 * sizeof(void *) - 0x1000; alloc_size < 0x800000; alloc_size <<= 1) + { + winetest_push_context( "size %#Ix", alloc_size ); + + ptr0 = pHeapAlloc( heap, HEAP_ZERO_MEMORY, alloc_size ); + ok( !!ptr0, "HeapAlloc failed, error %lu\n", GetLastError() ); + ptr1 = pHeapAlloc( heap, 0, alloc_size ); + ok( !!ptr1, "HeapAlloc failed, error %lu\n", GetLastError() ); + ptr2 = pHeapAlloc( heap, 0, alloc_size ); + ok( !!ptr2, "HeapAlloc failed, error %lu\n", GetLastError() ); + + todo_wine_if( sizeof(void *) == 8 || alloc_size == 0x7efe9 ) + ok( !((UINT_PTR)ptr0 & (8 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); + todo_wine_if( sizeof(void *) == 8 || alloc_size == 0x7efe9 ) + ok( !((UINT_PTR)ptr1 & (8 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); + todo_wine_if( sizeof(void *) == 8 || alloc_size == 0x7efe9 ) + ok( !((UINT_PTR)ptr2 & (8 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); + + expect_size = max( alloc_size, 2 * sizeof(void *) ); + expect_size = ALIGN_BLOCK_SIZE( expect_size + extra_size ); + todo_wine_if( alloc_size == 0x7efe9 ) + ok( min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ) > expect_size, "got diff %#I64x\n", + min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ) ); + + todo_wine_if( heap_flags & HEAP_TAIL_CHECKING_ENABLED ) + ok( !ptr0[alloc_size], "got block tail\n" ); + todo_wine_if( heap_flags & HEAP_TAIL_CHECKING_ENABLED ) + ok( !ptr1[alloc_size], "got block tail\n" ); + todo_wine_if( heap_flags & HEAP_TAIL_CHECKING_ENABLED ) + ok( !ptr2[alloc_size], "got block tail\n" ); + + ret = HeapFree( heap, 0, ptr2 ); + ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + ret = HeapFree( heap, 0, ptr1 ); + ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + ret = HeapFree( heap, 0, ptr0 ); + ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + + winetest_pop_context(); + } +} + static void test_heap_checks( DWORD flags ) { BYTE old, *p, *p2; @@ -2043,6 +2165,7 @@ static void test_child_heap( const char *arg ) heap = HeapCreate( HEAP_NO_SERIALIZE, 0, 0 ); ok( heap != GetProcessHeap(), "got unexpected heap\n" ); test_heap_layout( heap, global_flags, heap_flags|HEAP_NO_SERIALIZE|HEAP_GROWABLE|HEAP_PRIVATE ); + test_block_layout( heap, global_flags, heap_flags|HEAP_NO_SERIALIZE|HEAP_GROWABLE|HEAP_PRIVATE ); ret = HeapDestroy( heap ); ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() );

1 0

Eric Pouech : nsiproxy: Add intermediate variables for sscanf on ULONG.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: 73974636bde9897adf78e18332949f7d999bc69a URL: https://source.winehq.org/git/wine.git/?a=commit;h=73974636bde9897adf78e183… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 25 09:35:26 2022 +0100 nsiproxy: Add intermediate variables for sscanf on ULONG. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/tcp.c | 7 +++++-- dlls/nsiproxy.sys/udp.c | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 8e2d7e749a7..0dbee8418b9 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -534,6 +534,7 @@ static NTSTATUS tcp_conns_enumerate_all( UINT filter, struct nsi_tcp_conn_key *k FILE *fp; char buf[512], *ptr; int inode; + UINT laddr, raddr; if (!(fp = fopen( "/proc/net/tcp", "r" ))) return ERROR_NOT_SUPPORTED; @@ -547,15 +548,17 @@ static NTSTATUS tcp_conns_enumerate_all( UINT filter, struct nsi_tcp_conn_key *k while ((ptr = fgets( buf, sizeof(buf), fp ))) { if (sscanf( ptr, "%*x: %x:%hx %x:%hx %x %*s %*s %*s %*s %*s %d", - &key.local.Ipv4.sin_addr.WS_s_addr, &key.local.Ipv4.sin_port, - &key.remote.Ipv4.sin_addr.WS_s_addr, &key.remote.Ipv4.sin_port, + &laddr, &key.local.Ipv4.sin_port, + &raddr, &key.remote.Ipv4.sin_port, &dyn.state, &inode ) != 6) continue; dyn.state = tcp_state_to_mib_state( dyn.state ); if (filter && filter != dyn.state ) continue; key.local.Ipv4.sin_family = key.remote.Ipv4.sin_family = WS_AF_INET; + key.local.Ipv4.sin_addr.WS_s_addr = laddr; key.local.Ipv4.sin_port = htons( key.local.Ipv4.sin_port ); + key.remote.Ipv4.sin_addr.WS_s_addr = raddr; key.remote.Ipv4.sin_port = htons( key.remote.Ipv4.sin_port ); if (num < *count) diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index 0ba2f835e44..2248d74234b 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -223,6 +223,7 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, UINT key_size, void FILE *fp; char buf[512], *ptr; int inode; + UINT addr; if (!(fp = fopen( "/proc/net/udp", "r" ))) return ERROR_NOT_SUPPORTED; @@ -235,10 +236,11 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, UINT key_size, void while ((ptr = fgets( buf, sizeof(buf), fp ))) { if (sscanf( ptr, "%*u: %x:%hx %*s %*s %*s %*s %*s %*s %*s %d", - &key.local.Ipv4.sin_addr.WS_s_addr, &key.local.Ipv4.sin_port, &inode ) != 3) + &addr, &key.local.Ipv4.sin_port, &inode ) != 3) continue; key.local.Ipv4.sin_family = WS_AF_INET; + key.local.Ipv4.sin_addr.WS_s_addr = addr; key.local.Ipv4.sin_port = htons( key.local.Ipv4.sin_port ); stat.pid = find_owning_pid( pid_map, pid_map_size, inode );

1 0

Francois Gouget : testbot/cgi: Add a format parameter to GenerateHTMLValue().
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: tools Branch: master Commit: 46ecbb6325b91c03be6d3a376d86c67e71f9d348 URL: https://source.winehq.org/git/tools.git/?a=commit;h=46ecbb6325b91c03be6d3a3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 25 20:50:21 2022 +0200 testbot/cgi: Add a format parameter to GenerateHTMLValue(). This mostly allows specifying how it should format timestamps, though it could also be used to force intepreting an integer property as a boolean, etc. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ValueFormatter.pm | 31 ++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm index 62c1499..638504d 100644 --- a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm +++ b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm @@ -163,27 +163,48 @@ Generates an HTML snippet representing the value in a user-readable form. The Parent parameter must point to a class that implements the escapeHTML() method. +The format parameter can be used to specify how to display the specified +value and should have one of the basic property descriptor types with a couple +of extensions for timestamps: + +=over + +=item "DT" +Show the date and time mostly in ISO 8601 format. This is the default format +for timestamp properties. + +=item "timetipdate" +Same as above but put the date part in a tooltip. + +=back + =back =cut -sub GenerateValueHTML($$$); +sub GenerateValueHTML($$$;$); -sub GenerateValueHTML($$$) +sub GenerateValueHTML($$$;$) { - my ($Parent, $PropertyDescriptor, $Value) = @_; + my ($Parent, $PropertyDescriptor, $Value, $Format) = @_; if ($PropertyDescriptor->GetClass() eq "Basic") { - if ($PropertyDescriptor->GetType() eq "B") + $Format ||= $PropertyDescriptor->GetType(); + if ($Format eq "B") { print $Value ? "Yes" : "No"; return; } - if ($PropertyDescriptor->GetType() eq "DT") + if ($Format eq "DT") { GenerateDateTime($Value); return; } + if ($Format eq "timetipdate") + { + GenerateTimeTipDate($Value); + return; + } } elsif ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) {

1 0

Francois Gouget : testbot/web: Fix and share the main page's job completion date formatting.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: tools Branch: master Commit: 5e6939a84bbe45f9f97cc5f07a509e535d04e558 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5e6939a84bbe45f9f97cc5f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 25 20:50:49 2022 +0200 testbot/web: Fix and share the main page's job completion date formatting. The main page still depended on the pre-datetime.js ShowDateTime() JavaScript function, which the new one is not compatible with. Add GenerateTipDateTime() so a timestamp can easily be added as a tooltip to an arbitrary HTML chunk. Tweak the column title to better reflect its content (contrast duration with elapsed time). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ValueFormatter.pm | 47 ++++++++++++++++++++++++++- testbot/web/WineTestBot.css | 1 + testbot/web/index.pl | 12 ++----- testbot/web/js/datetime.js | 19 ++++++++--- 4 files changed, 65 insertions(+), 14 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm index 638504d..d987cee 100644 --- a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm +++ b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm @@ -22,7 +22,7 @@ use strict; package ObjectModel::CGI::ValueFormatter; use Exporter 'import'; -our @EXPORT = qw(GetDateTimeJSFile GenerateDateTime +our @EXPORT = qw(GetDateTimeJSFile GenerateDateTime GenerateTipDateTime GenerateTimeTipDate GenerateValueHTML); use POSIX qw(strftime); @@ -106,6 +106,51 @@ sub GenerateDateTime($;$$) =pod =over 12 +=item C<GenerateTipDateTime()> + +Adds a tooltip containing the timestamp to the specified HTML chunk. + +The timestamp is converted to the ISO 8601 format in the user's timezone if +JavaScript is available and in the server's timezone otherwise. + +The default for TagAttrs is 'a' and it should always be a tag that shows the +content of the title attribute as a tooltip. + +See GenerateDateTime() for more details. + +=back +=cut + +sub GenerateTipDateTime($$;$$) +{ + my ($Sec1970, $Html, $Class, $TagAttrs) = @_; + + if (defined $Sec1970) + { + my $Tag; + if ($TagAttrs) + { + $Tag = $TagAttrs; + $Tag =~ s/ .*$//; + } + else + { + $TagAttrs = $Tag = "a"; + } + $Class = "$Class " if ($Class); + print "<$TagAttrs class='${Class}tipdatetime' timestamp='$Sec1970' ", + strftime("title='%Y-%m-%d %H:%M:%S'>", localtime($Sec1970)), + "$Html</$Tag>"; + } + else + { + print $Html; + } +} + +=pod +=over 12 + =item C<GenerateTimeTipDate()> Show the timestamp's time with the date as a tooltip. diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 0955f58..350ab64 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -408,6 +408,7 @@ pre .log-fullnew { color: red; font-weight: bold; } a.title { color:inherit; text-decoration: none; } +a.tipdatetime { color:inherit; text-decoration: none; } a.timetipdate { color:inherit; text-decoration: none; } th.Record { text-align: center; } diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 4048cac..b07b39d 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -25,7 +25,7 @@ package JobStatusBlock; use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); -use POSIX qw(strftime); +use ObjectModel::CGI::ValueFormatter; use WineTestBot::Branches; use WineTestBot::Users; @@ -65,7 +65,7 @@ sub GenerateHeaderView($$$) } elsif ($PropertyName eq "Ended") { - print "<a class='title' title='Ended'>Time</a>"; + print "<a class='title' title='Completion timestamp'>Elapsed</a>"; } else { @@ -156,13 +156,7 @@ sub GenerateDataView($$$) if (defined $Job->Ended) { my $Duration = $Job->Ended - $Job->Submitted; - my $TagId = "E". $Job->Id; - print "<a id='$TagId' class='title' title='", - strftime("%Y-%m-%d %H:%M:%S", localtime($Job->Ended)), - "'>", DurationToString($Duration), "</a>\n"; - print "<script type='text/javascript'></script>"; + GenerateTipDateTime($Job->Ended, DurationToString($Duration)); } else { diff --git a/testbot/web/js/datetime.js b/testbot/web/js/datetime.js index 47b0feb..23b7b27 100644 --- a/testbot/web/js/datetime.js +++ b/testbot/web/js/datetime.js @@ -23,13 +23,21 @@ function Pad2(n) return n < 10 ? '0' + n : n; } -function ShowDateTime(dom) +function ShowDateTime(dom, attr) { const sec1970 = dom.getAttribute("timestamp"); const dt = new Date(sec1970 * 1000); - dom.innerHTML = dt.getFullYear() +'-'+ Pad2(dt.getMonth() + 1) +'-'+ - Pad2(dt.getDate()) +' '+ Pad2(dt.getHours()) +':'+ - Pad2(dt.getMinutes()) +':'+ Pad2(dt.getSeconds()) + const pretty = dt.getFullYear() +'-'+ Pad2(dt.getMonth() + 1) +'-'+ + Pad2(dt.getDate()) +' '+ Pad2(dt.getHours()) +':'+ + Pad2(dt.getMinutes()) +':'+ Pad2(dt.getSeconds()); + if (attr == null) + { + dom.innerHTML = pretty; + } + else + { + dom.setAttribute(attr, pretty); + } } function ShowTimeTipDate(dom) @@ -47,6 +55,9 @@ function init() document.querySelectorAll(".datetime").forEach(dom => { ShowDateTime(dom); }); + document.querySelectorAll(".tipdatetime").forEach(dom => { + ShowDateTime(dom, 'title'); + }); document.querySelectorAll(".timetipdate").forEach(dom => { ShowTimeTipDate(dom); });

1 0

Francois Gouget : testbot/cgi: Pass a column descriptor to Generate{Header,Data}View().
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: tools Branch: master Commit: accf09eca29d131f0409084f3447e6b2ea994de2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=accf09eca29d131f0409084… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 25 20:50:10 2022 +0200 testbot/cgi: Pass a column descriptor to Generate{Header,Data}View(). Instead of being called for every row, DisplayProperty() is now called only once and the result is stored in the corresponding column descriptor. This also allows passing extra information such as the column index to Generate{Header,Data}View(). And this allows GenerateList() to iterate only on the properties that are actually being displayed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 81 ++++++++++++++++---------- testbot/web/JobDetails.pl | 14 ++--- testbot/web/PatchesList.pl | 6 +- testbot/web/admin/UsersList.pl | 6 +- testbot/web/index.pl | 12 ++-- 5 files changed, 68 insertions(+), 51 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 03f1d18..14e3cfe 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -227,6 +227,20 @@ sub GetDetailsLink($$) Generates an HTML snippet for the column title. +The Col parameter describes the column to generate the header for. +It contains the following information: +=over 12 +=item Descriptor +The corresponding PropertyDescriptor object. + +=item Display +The value returned by DisplayProperty(), normally "ro". + +=item Index +The index of the column (see $Row->{Cols}). + +=back + The Row parameter contains the following information: =over 12 @@ -234,6 +248,10 @@ The Row parameter contains the following information: The list of item properties, including those that DisplayProperty() says should be hidden. +=item Cols +The collection block's list of columns. This excludes any hidden property. +The following relation holds: $Row->{Cols}->[$Col->{Index}] == $Col + =item DetailsPage The base link to the item details page if any. See GetDetailsPage(). @@ -253,9 +271,9 @@ The total number of rows (excluding the header). sub GenerateHeaderView($$$) { - my ($self, $_Row, $PropertyDescriptor) = @_; + my ($self, $_Row, $Col) = @_; - print $self->escapeHTML($PropertyDescriptor->GetDisplayName()); + print $self->escapeHTML($Col->{Descriptor}->GetDisplayName()); } =pod @@ -266,8 +284,8 @@ sub GenerateHeaderView($$$) Generates an HTML snippet representing the property value in a user-readable form. -The Row parameter contains the same information as for GenerateHeaderView() -plus: +See GenerateHeaderView() for a description of the Row and Col parameters. +The Row parameter has the following extra fields: =over 12 =item Row @@ -286,11 +304,11 @@ passing the row to GetDetailsLink(). sub GenerateDataView($$$) { - my ($self, $Row, $PropertyDescriptor) = @_; + my ($self, $Row, $Col) = @_; - my $PropertyName = $PropertyDescriptor->GetName(); + my $PropertyName = $Col->{Descriptor}->GetName(); my $Value = $Row->{Item}->$PropertyName; - GenerateValueHTML($self, $PropertyDescriptor, $Value); + GenerateValueHTML($self, $Col->{Descriptor}, $Value); } @@ -317,10 +335,10 @@ sub GenerateFormStart($) sub GenerateHeaderCell($$$) { - my ($self, $Row, $PropertyDescriptor) = @_; + my ($self, $Row, $Col) = @_; print "<th>"; - $self->GenerateHeaderView($Row, $PropertyDescriptor); + $self->GenerateHeaderView($Row, $Col); print "</th>\n"; } @@ -336,12 +354,9 @@ sub GenerateHeaderRow($$) GenerateMasterCheckbox("block$self->{Unique}"); print "</th>\n"; } - foreach my $PropertyDescriptor (@{$Row->{PropertyDescriptors}}) + foreach my $Col (@{$Row->{Cols}}) { - if ($self->DisplayProperty($PropertyDescriptor)) - { - $self->GenerateHeaderCell($Row, $PropertyDescriptor); - } + $self->GenerateHeaderCell($Row, $Col); } print "</tr>\n"; } @@ -356,16 +371,16 @@ sub SelName($$) sub GenerateDataCell($$$) { - my ($self, $Row, $PropertyDescriptor) = @_; + my ($self, $Row, $Col) = @_; print "<td>"; my $CloseLink; - if ($Row->{DetailsPage} and $PropertyDescriptor->GetIsKey()) + if ($Row->{DetailsPage} and $Col->{Descriptor}->GetIsKey()) { print "<a href='", $self->escapeHTML($self->GetDetailsLink($Row)), "'>"; $CloseLink = "</a>"; } - $self->GenerateDataView($Row, $PropertyDescriptor); + $self->GenerateDataView($Row, $Col); print "$CloseLink</td>\n"; } @@ -380,12 +395,9 @@ sub GenerateDataRow($$) print "<td><input name='", $self->SelName($Row->{Item}->GetKey()), "' type='checkbox' cbgroup='block$self->{Unique}'/></td>\n"; } - foreach my $PropertyDescriptor (@{$Row->{PropertyDescriptors}}) + foreach my $Col (@{$Row->{Cols}}) { - if ($self->DisplayProperty($PropertyDescriptor)) - { - $self->GenerateDataCell($Row, $PropertyDescriptor); - } + $self->GenerateDataCell($Row, $Col); } print "</tr>\n"; } @@ -403,18 +415,22 @@ sub GenerateList($) my $Collection = $self->{Collection}; my $PropertyDescriptors = $Collection->GetPropertyDescriptors(); + my $ColIndex = 0; + my (@Cols, $HasDT); + foreach my $PropertyDescriptor (@$PropertyDescriptors) + { + my $Display = $self->DisplayProperty($PropertyDescriptor); + next if (!$Display); + push @Cols, {Descriptor => $PropertyDescriptor, + Display => $Display, + Index => $ColIndex++}; + $HasDT ||= ($PropertyDescriptor->GetClass() eq "Basic" and + $PropertyDescriptor->GetType() eq "DT"); + } my $Items = $self->{Collection}->GetSortedItems(); - if (@$Items != 0) + if ($HasDT and @$Items != 0) { - foreach my $PropertyDescriptor (@$PropertyDescriptors) - { - if ($PropertyDescriptor->GetClass() eq "Basic" and - $PropertyDescriptor->GetType() eq "DT") - { - $self->{EnclosingPage}->GenerateImportJS(GetDateTimeJSFile()); - last; - } - } + $self->{EnclosingPage}->GenerateImportJS(GetDateTimeJSFile()); } print "<div class='CollectionBlock'>\n"; @@ -427,6 +443,7 @@ sub GenerateList($) print "<thead>\n"; my $Row = { PropertyDescriptors => $PropertyDescriptors, + Cols => \@Cols, DetailsPage => $self->GetDetailsPage(), ItemActions => $self->{RW} ? $self->GetItemActions() : [], Row => 0, # 0 for the header ---> 1 for the first line diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index e39df41..591a47e 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -60,9 +60,9 @@ sub DisplayProperty($$) sub GenerateHeaderView($$$) { - my ($self, $Row, $PropertyDescriptor) = @_; + my ($self, $Row, $Col) = @_; - my $PropertyName = $PropertyDescriptor->GetName(); + my $PropertyName = $Col->{Descriptor}->GetName(); if ($PropertyName eq "CmdLineArg") { print "Arguments / <span class='MissionHeader'>Missions</span>"; @@ -73,16 +73,16 @@ sub GenerateHeaderView($$$) } else { - $self->SUPER::GenerateHeaderView($Row, $PropertyDescriptor); + $self->SUPER::GenerateHeaderView($Row, $Col); } } sub GenerateDataView($$$) { - my ($self, $Row, $PropertyDescriptor) = @_; + my ($self, $Row, $Col) = @_; my $StepTask = $Row->{Item}; - my $PropertyName = $PropertyDescriptor->GetName(); + my $PropertyName = $Col->{Descriptor}->GetName(); if ($PropertyName eq "VM") { print "<a href='#k", $self->escapeHTML($Row->{Item}->GetKey()), "'>"; @@ -103,7 +103,7 @@ sub GenerateDataView($$$) } else { - $self->SUPER::GenerateDataView($Row, $PropertyDescriptor); + $self->SUPER::GenerateDataView($Row, $Col); } } elsif ($PropertyName eq "CmdLineArg") @@ -144,7 +144,7 @@ sub GenerateDataView($$$) } else { - $self->SUPER::GenerateDataView($Row, $PropertyDescriptor); + $self->SUPER::GenerateDataView($Row, $Col); } } diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index a1c5171..30cfc75 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -46,9 +46,9 @@ sub DisplayProperty($$) sub GenerateDataView($$$) { - my ($self, $Row, $PropertyDescriptor) = @_; + my ($self, $Row, $Col) = @_; - if ($PropertyDescriptor->GetName() eq "Disposition" and + if ($Col->{Descriptor}->GetName() eq "Disposition" and $Row->{Item}->Disposition =~ /job ([0-9]+)$/) { my $JobId = $1; @@ -56,7 +56,7 @@ sub GenerateDataView($$$) } else { - $self->SUPER::GenerateDataView($Row, $PropertyDescriptor); + $self->SUPER::GenerateDataView($Row, $Col); } } diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index ec6d282..5f9f47b 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -47,9 +47,9 @@ sub DisplayProperty($$) sub GenerateDataView($$$) { - my ($self, $Row, $PropertyDescriptor) = @_; + my ($self, $Row, $Col) = @_; - if ($PropertyDescriptor->GetName() eq "Status") + if ($Col->{Descriptor}->GetName() eq "Status") { my $User = $Row->{Item}; my $Status = $User->Status; @@ -87,7 +87,7 @@ sub GenerateDataView($$$) } else { - $self->SUPER::GenerateDataView($Row, $PropertyDescriptor); + $self->SUPER::GenerateDataView($Row, $Col); } } diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 1c506c9..331ee85 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -51,9 +51,9 @@ sub DisplayProperty($$) sub GenerateHeaderView($$$) { - my ($self, $Row, $PropertyDescriptor) = @_; + my ($self, $Row, $Col) = @_; - my $PropertyName = $PropertyDescriptor->GetName(); + my $PropertyName = $Col->{Descriptor}->GetName(); if ($PropertyName eq "Priority") { print "<a class='title' title='Higher values indicate a lower priority'>Nice</a>"; @@ -64,16 +64,16 @@ sub GenerateHeaderView($$$) } else { - $self->SUPER::GenerateHeaderView($Row, $PropertyDescriptor); + $self->SUPER::GenerateHeaderView($Row, $Col); } } sub GenerateDataView($$$) { - my ($self, $Row, $PropertyDescriptor) = @_; + my ($self, $Row, $Col) = @_; my $Job = $Row->{Item}; - my $PropertyName = $PropertyDescriptor->GetName(); + my $PropertyName = $Col->{Descriptor}->GetName(); if ($PropertyName eq "User") { if (defined $Job->Patch and defined $Job->Patch->FromName and @@ -166,7 +166,7 @@ sub GenerateDataView($$$) } else { - $self->SUPER::GenerateDataView($Row, $PropertyDescriptor); + $self->SUPER::GenerateDataView($Row, $Col); } }

1 0

Francois Gouget : testbot/cgi: Let DisplayProperty() specify how to format the property.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: tools Branch: master Commit: 4df626aaeba5c9063b7826ebc56d6783e68f0bce URL: https://source.winehq.org/git/tools.git/?a=commit;h=4df626aaeba5c9063b7826e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 25 20:50:29 2022 +0200 testbot/cgi: Let DisplayProperty() specify how to format the property. This applies to CollectionBlocks as well as FormPages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 24 ++++++++++++---- testbot/lib/ObjectModel/CGI/FormPage.pm | 39 +++++++++++++++----------- 2 files changed, 42 insertions(+), 21 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 14e3cfe..b2ebb2e 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -166,10 +166,15 @@ sub GenerateErrorPopup($) =item C<DisplayProperty()> -Specifies whether to hide the given property. +Specifies whether to hide the given property and how to format it. -Any value evaluating to false specifies that the property should be hidden and -all others that it should be shown. +Returns a (display, format) array where the format value is optional. +If the display value is false the property is hidden. Otherwise it should be +"ro" to get a read-only view. + +The format value is passed to GenerateDataView() which can use it to decide +how to format the property. By default it is simply passed to +ValueFormatter::GenerateValueHTML(). =back =cut @@ -299,6 +304,14 @@ The object for the current row. Furthermore one can get the link to the current object's details page by passing the row to GetDetailsLink(). +The Col parameter has the following extra field: +=over 12 +=item Format +The format to be used to display the property. +If undefined the default formatting is used. + +=back + =back =cut @@ -308,7 +321,7 @@ sub GenerateDataView($$$) my $PropertyName = $Col->{Descriptor}->GetName(); my $Value = $Row->{Item}->$PropertyName; - GenerateValueHTML($self, $Col->{Descriptor}, $Value); + GenerateValueHTML($self, $Col->{Descriptor}, $Value, $Col->{Format}); } @@ -419,10 +432,11 @@ sub GenerateList($) my (@Cols, $HasDT); foreach my $PropertyDescriptor (@$PropertyDescriptors) { - my $Display = $self->DisplayProperty($PropertyDescriptor); + my ($Display, $Format) = $self->DisplayProperty($PropertyDescriptor); next if (!$Display); push @Cols, {Descriptor => $PropertyDescriptor, Display => $Display, + Format => $Format, Index => $ColIndex++}; $HasDT ||= ($PropertyDescriptor->GetClass() eq "Basic" and $PropertyDescriptor->GetType() eq "DT"); diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 7fd2f56..e286880 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -156,16 +156,18 @@ sub GetPropertyDescriptorByName($$) =item C<DisplayProperty()> -Specifies whether to hide, display or allow editing the given property. +Specifies whether to hide, display or allow editing the given property, and +optionally how to format it. -Return values: +Returns a (display, format) array where the display value is one of the +following: =over =item "" Any value evaluating to false specifies that the property should be hidden. =item "ro" Specifies that the property is read-only, i.e. GenerateField() should display -it instead of generating an edit field. +it using the default format instead of generating an edit field. =item "rw" Specifies that GenerateField() should allow editing the property. @@ -174,6 +176,11 @@ HTTP parameter name. =back +The optional format value is passed to GenerateValueInput() and +GenerateValueView() which can use it to decide how to present the value. +In the default implementation the format is only used for read-only properties +and is passed to ValueFormatter::GenerateValueHTML(). + =back =cut @@ -278,11 +285,11 @@ Generates an HTML snippet representing the value in a user-readable form. =back =cut -sub GenerateValueView($$$) +sub GenerateValueView($$$$) { - my ($self, $PropertyDescriptor, $Value) = @_; + my ($self, $PropertyDescriptor, $Value, $Format) = @_; - GenerateValueHTML($self, $PropertyDescriptor, $Value); + GenerateValueHTML($self, $PropertyDescriptor, $Value, $Format); } sub GetInputType($$) @@ -329,9 +336,9 @@ Generates an HTML snippet allowing the specified value to be edited. =back =cut -sub GenerateValueInput($$$) +sub GenerateValueInput($$$$) { - my ($self, $PropertyDescriptor, $Value) = @_; + my ($self, $PropertyDescriptor, $Value, $_Format) = @_; my $InputType = $self->GetInputType($PropertyDescriptor); if ($InputType eq "checkbox") @@ -419,9 +426,9 @@ sub GenerateFormStart($) "' method='$self->{Method}' enctype='multipart/form-data'>\n"; } -sub GenerateField($$$) +sub GenerateField($$$$) { - my ($self, $PropertyDescriptor, $Display) = @_; + my ($self, $PropertyDescriptor, $Display, $Format) = @_; print "<div class='ItemProperty'><label>", $self->escapeHTML($self->GetDisplayName($PropertyDescriptor)), @@ -431,12 +438,12 @@ sub GenerateField($$$) if ($Display eq "rw") { print "<div class='ItemValue'>"; - $self->GenerateValueInput($PropertyDescriptor, $Value); + $self->GenerateValueInput($PropertyDescriptor, $Value, $Format); print "</div>"; } else { - $self->GenerateValueView($PropertyDescriptor, $Value); + $self->GenerateValueView($PropertyDescriptor, $Value, $Format); } print "</div>\n"; @@ -448,8 +455,8 @@ sub GenerateFields($) foreach my $PropertyDescriptor (@{$self->GetPropertyDescriptors()}) { - my $Display = $self->DisplayProperty($PropertyDescriptor); - $self->GenerateField($PropertyDescriptor, $Display) if ($Display); + my ($Display, $Format) = $self->DisplayProperty($PropertyDescriptor); + $self->GenerateField($PropertyDescriptor, $Display, $Format) if ($Display); } } @@ -498,7 +505,7 @@ sub GenerateBody($) if (defined $self->{ErrField}) { my $PropertyDescriptor = $self->GetPropertyDescriptorByName($self->{ErrField}); - if ($PropertyDescriptor and !$self->DisplayProperty($PropertyDescriptor)) + if ($PropertyDescriptor and !($self->DisplayProperty($PropertyDescriptor))[0]) { $self->{ErrMessage} = "Internal error?\n$self->{ErrMessage}"; } @@ -599,7 +606,7 @@ sub Save($) { if ($PropertyDescriptor->GetClass() eq "Basic" && $PropertyDescriptor->GetType() eq "B" && - $self->DisplayProperty($PropertyDescriptor) eq "rw" && + ($self->DisplayProperty($PropertyDescriptor))[0] eq "rw" && ! defined($self->GetParam($PropertyDescriptor->GetName()))) { if (! $self->SaveProperty($PropertyDescriptor, ""))

1 0