wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Alexandre Julliard : kernelbase: Reimplement GetCurrencyFormatW/Ex() using get_locale_info().
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 9afc20949a4d63c4d1323683aeda4f7af13f3969 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9afc20949a4d63c4d1323683… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 10:37:38 2022 +0200 kernelbase: Reimplement GetCurrencyFormatW/Ex() using get_locale_info(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/lcformat.c | 371 ---------------------------------------- dlls/kernel32/tests/locale.c | 20 +++ dlls/kernelbase/kernelbase.spec | 4 +- dlls/kernelbase/locale.c | 205 ++++++++++++++++++++++ 5 files changed, 229 insertions(+), 375 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9afc20949a4d63c4d132…

1 0

Alexandre Julliard : kernelbase: Reimplement GetNumberFormatW/Ex() using get_locale_info().
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 56099a31242dcc522fb94643e70553e152c522ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=56099a31242dcc522fb94643… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 10:37:03 2022 +0200 kernelbase: Reimplement GetNumberFormatW/Ex() using get_locale_info(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/lcformat.c | 268 ---------------------------------------- dlls/kernel32/tests/locale.c | 23 ++++ dlls/kernelbase/kernelbase.spec | 4 +- dlls/kernelbase/locale.c | 243 ++++++++++++++++++++++++++++++++++++ 5 files changed, 270 insertions(+), 272 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=56099a31242dcc522fb9…

1 0

Alexandre Julliard : kernel32: Reimplement GetCurrencyFormatA().
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 42afb693b10dee9a06fcadb204560490a24f1754 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42afb693b10dee9a06fcadb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 10:35:45 2022 +0200 kernel32: Reimplement GetCurrencyFormatA(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lcformat.c | 95 ------------------------------------------------ dlls/kernel32/locale.c | 56 ++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 95 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index a38edcc7758..de31db5c113 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1261,101 +1261,6 @@ INT WINAPI GetNumberFormatEx(LPCWSTR name, DWORD flags, return GetNumberFormatW(lcid, flags, value, format, number, numout); } -/************************************************************************** - * GetCurrencyFormatA (KERNEL32.@) - * - * Format a currency string for a given locale. - * - * PARAMS - * lcid [I] Locale to format for - * dwFlags [I] LOCALE_ flags from "winnls.h" - * lpszValue [I] String to format - * lpFormat [I] Formatting overrides - * lpCurrencyStr [O] Destination for formatted string - * cchOut [I] Size of lpCurrencyStr, or 0 to calculate the resulting size - * - * NOTES - * - lpszValue can contain only '0' - '9', '-' and '.'. - * - If lpFormat is non-NULL, dwFlags must be 0. In this case lpszValue will - * be formatted according to the format details returned by GetLocaleInfoA(). - * - This function rounds the currency if the number of decimals exceeds the - * locales number of currency decimal places. - * - If cchOut is 0, this function does not write to lpCurrencyStr. - * - The ANSI version of this function fails if lcid is Unicode only. - * - * RETURNS - * Success: The number of character written to lpNumberStr, or that would - * have been written, if cchOut is 0. - * Failure: 0. Use GetLastError() to determine the cause. - */ -INT WINAPI GetCurrencyFormatA(LCID lcid, DWORD dwFlags, - LPCSTR lpszValue, const CURRENCYFMTA *lpFormat, - LPSTR lpCurrencyStr, int cchOut) -{ - DWORD cp = CP_ACP; - WCHAR szDec[8], szGrp[8], szCy[8], szIn[128], szOut[128]; - CURRENCYFMTW fmt; - const CURRENCYFMTW *pfmt = NULL; - INT iRet; - - TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_a(lpszValue), - lpFormat, lpCurrencyStr, cchOut); - - if (NLS_IsUnicodeOnlyLcid(lcid)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (!(dwFlags & LOCALE_USE_CP_ACP)) - { - const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); - if (!node) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - cp = node->dwCodePage; - } - - if (lpFormat) - { - memcpy(&fmt, lpFormat, sizeof(fmt)); - pfmt = &fmt; - if (lpFormat->lpDecimalSep) - { - MultiByteToWideChar(cp, 0, lpFormat->lpDecimalSep, -1, szDec, ARRAY_SIZE(szDec)); - fmt.lpDecimalSep = szDec; - } - if (lpFormat->lpThousandSep) - { - MultiByteToWideChar(cp, 0, lpFormat->lpThousandSep, -1, szGrp, ARRAY_SIZE(szGrp)); - fmt.lpThousandSep = szGrp; - } - if (lpFormat->lpCurrencySymbol) - { - MultiByteToWideChar(cp, 0, lpFormat->lpCurrencySymbol, -1, szCy, ARRAY_SIZE(szCy)); - fmt.lpCurrencySymbol = szCy; - } - } - - if (lpszValue) - MultiByteToWideChar(cp, 0, lpszValue, -1, szIn, ARRAY_SIZE(szIn)); - - if (cchOut > (int) ARRAY_SIZE(szOut)) - cchOut = ARRAY_SIZE(szOut); - - szOut[0] = '\0'; - - iRet = GetCurrencyFormatW(lcid, dwFlags, lpszValue ? szIn : NULL, pfmt, - lpCurrencyStr ? szOut : NULL, cchOut); - - if (szOut[0] && lpCurrencyStr) - WideCharToMultiByte(cp, 0, szOut, -1, lpCurrencyStr, cchOut, 0, 0); - return iRet; -} - /* Formatting states for Currencies. We use flags to avoid code duplication. */ #define CF_PARENS 0x1 /* Parentheses */ #define CF_MINUS_LEFT 0x2 /* '-' to the left */ diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index c6cbec870e2..16aa0bdd2aa 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -464,6 +464,62 @@ int WINAPI GetNumberFormatA( LCID lcid, DWORD flags, const char *value, } +/************************************************************************** + * GetCurrencyFormatA (KERNEL32.@) + */ +int WINAPI GetCurrencyFormatA( LCID lcid, DWORD flags, const char *value, + const CURRENCYFMTA *format, char *buffer, int len ) +{ + UINT cp = get_lcid_codepage( lcid, flags ); + WCHAR input[128], output[128]; + int ret; + + TRACE( "(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, flags, debugstr_a(value), format, buffer, len ); + + if (len < 0 || (len && !buffer) || !value) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + MultiByteToWideChar( cp, 0, value, -1, input, ARRAY_SIZE(input) ); + + if (len > (int)ARRAY_SIZE(output)) len = ARRAY_SIZE(output); + + if (format) + { + CURRENCYFMTW fmt; + WCHAR fmt_decimal[4], fmt_thousand[4], fmt_symbol[13]; + + if (flags & LOCALE_NOUSEROVERRIDE) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } + if (!format->lpDecimalSep || !format->lpThousandSep || !format->lpCurrencySymbol) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + MultiByteToWideChar( cp, 0, format->lpDecimalSep, -1, fmt_decimal, ARRAY_SIZE(fmt_decimal) ); + MultiByteToWideChar( cp, 0, format->lpThousandSep, -1, fmt_thousand, ARRAY_SIZE(fmt_thousand) ); + MultiByteToWideChar( cp, 0, format->lpCurrencySymbol, -1, fmt_symbol, ARRAY_SIZE(fmt_symbol) ); + fmt.NumDigits = format->NumDigits; + fmt.LeadingZero = format->LeadingZero; + fmt.Grouping = format->Grouping; + fmt.NegativeOrder = format->NegativeOrder; + fmt.PositiveOrder = format->PositiveOrder; + fmt.lpDecimalSep = fmt_decimal; + fmt.lpThousandSep = fmt_thousand; + fmt.lpCurrencySymbol = fmt_symbol; + ret = GetCurrencyFormatW( lcid, flags, input, &fmt, output, len ); + } + else ret = GetCurrencyFormatW( lcid, flags, input, NULL, output, len ); + + if (ret) ret = WideCharToMultiByte( cp, 0, output, -1, buffer, len, 0, 0 ); + return ret; +} + + /****************************************************************************** * GetGeoInfoA (KERNEL32.@) */

1 0

Alexandre Julliard : kernel32: Reimplement GetNumberFormatA().
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: b6bf69ef804146f81b803719a72d8c6afde184ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6bf69ef804146f81b803719… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 10:35:27 2022 +0200 kernel32: Reimplement GetNumberFormatA(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lcformat.c | 90 ------------------------------------------------ dlls/kernel32/locale.c | 53 ++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 90 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 7f112767880..a38edcc7758 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -986,96 +986,6 @@ INT WINAPI GetTimeFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, lpFormat, lpTimeStr, cchOut); } -/************************************************************************** - * GetNumberFormatA (KERNEL32.@) - * - * Format a number string for a given locale. - * - * PARAMS - * lcid [I] Locale to format for - * dwFlags [I] LOCALE_ flags from "winnls.h" - * lpszValue [I] String to format - * lpFormat [I] Formatting overrides - * lpNumberStr [O] Destination for formatted string - * cchOut [I] Size of lpNumberStr, or 0 to calculate the resulting size - * - * NOTES - * - lpszValue can contain only '0' - '9', '-' and '.'. - * - If lpFormat is non-NULL, dwFlags must be 0. In this case lpszValue will - * be formatted according to the format details returned by GetLocaleInfoA(). - * - This function rounds the number string if the number of decimals exceeds the - * locales normal number of decimal places. - * - If cchOut is 0, this function does not write to lpNumberStr. - * - The ANSI version of this function fails if lcid is Unicode only. - * - * RETURNS - * Success: The number of character written to lpNumberStr, or that would - * have been written, if cchOut is 0. - * Failure: 0. Use GetLastError() to determine the cause. - */ -INT WINAPI GetNumberFormatA(LCID lcid, DWORD dwFlags, - LPCSTR lpszValue, const NUMBERFMTA *lpFormat, - LPSTR lpNumberStr, int cchOut) -{ - DWORD cp = CP_ACP; - WCHAR szDec[8], szGrp[8], szIn[128], szOut[128]; - NUMBERFMTW fmt; - const NUMBERFMTW *pfmt = NULL; - INT iRet; - - TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_a(lpszValue), - lpFormat, lpNumberStr, cchOut); - - if (NLS_IsUnicodeOnlyLcid(lcid)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (!(dwFlags & LOCALE_USE_CP_ACP)) - { - const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); - if (!node) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - cp = node->dwCodePage; - } - - if (lpFormat) - { - memcpy(&fmt, lpFormat, sizeof(fmt)); - pfmt = &fmt; - if (lpFormat->lpDecimalSep) - { - MultiByteToWideChar(cp, 0, lpFormat->lpDecimalSep, -1, szDec, ARRAY_SIZE(szDec)); - fmt.lpDecimalSep = szDec; - } - if (lpFormat->lpThousandSep) - { - MultiByteToWideChar(cp, 0, lpFormat->lpThousandSep, -1, szGrp, ARRAY_SIZE(szGrp)); - fmt.lpThousandSep = szGrp; - } - } - - if (lpszValue) - MultiByteToWideChar(cp, 0, lpszValue, -1, szIn, ARRAY_SIZE(szIn)); - - if (cchOut > (int) ARRAY_SIZE(szOut)) - cchOut = ARRAY_SIZE(szOut); - - szOut[0] = '\0'; - - iRet = GetNumberFormatW(lcid, dwFlags, lpszValue ? szIn : NULL, pfmt, - lpNumberStr ? szOut : NULL, cchOut); - - if (szOut[0] && lpNumberStr) - WideCharToMultiByte(cp, 0, szOut, -1, lpNumberStr, cchOut, 0, 0); - return iRet; -} - /* Number parsing state flags */ #define NF_ISNEGATIVE 0x1 /* '-' found */ #define NF_ISREAL 0x2 /* '.' found */ diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 2187d3e2883..c6cbec870e2 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -411,6 +411,59 @@ int WINAPI SetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPCSTR data ) } +/************************************************************************** + * GetNumberFormatA (KERNEL32.@) + */ +int WINAPI GetNumberFormatA( LCID lcid, DWORD flags, const char *value, + const NUMBERFMTA *format, char *buffer, int len ) +{ + UINT cp = get_lcid_codepage( lcid, flags ); + WCHAR input[128], output[128]; + int ret; + + TRACE( "(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, flags, debugstr_a(value), format, buffer, len ); + + if (len < 0 || (len && !buffer) || !value) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + MultiByteToWideChar( cp, 0, value, -1, input, ARRAY_SIZE(input) ); + + if (len > (int)ARRAY_SIZE(output)) len = ARRAY_SIZE(output); + + if (format) + { + NUMBERFMTW fmt; + WCHAR fmt_decimal[4], fmt_thousand[4]; + + if (flags & LOCALE_NOUSEROVERRIDE) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } + if (!format->lpDecimalSep || !format->lpThousandSep) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + MultiByteToWideChar( cp, 0, format->lpDecimalSep, -1, fmt_decimal, ARRAY_SIZE(fmt_decimal) ); + MultiByteToWideChar( cp, 0, format->lpThousandSep, -1, fmt_thousand, ARRAY_SIZE(fmt_thousand) ); + fmt.NumDigits = format->NumDigits; + fmt.LeadingZero = format->LeadingZero; + fmt.Grouping = format->Grouping; + fmt.NegativeOrder = format->NegativeOrder; + fmt.lpDecimalSep = fmt_decimal; + fmt.lpThousandSep = fmt_thousand; + ret = GetNumberFormatW( lcid, flags, input, &fmt, output, len ); + } + else ret = GetNumberFormatW( lcid, flags, input, NULL, output, len ); + + if (ret) ret = WideCharToMultiByte( cp, 0, output, -1, buffer, len, 0, 0 ); + return ret; +} + + /****************************************************************************** * GetGeoInfoA (KERNEL32.@) */

1 0

Alexandre Julliard : shlwapi: Fix copy/paste typo in number format initialization.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 88a91169c5299c2eb4df5438b5052b08b10b118f URL: https://source.winehq.org/git/wine.git/?a=commit;h=88a91169c5299c2eb4df5438… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 10:33:39 2022 +0200 shlwapi: Fix copy/paste typo in number format initialization. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 49aef6d12aa..77e3b978cee 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -56,7 +56,7 @@ static void FillNumberFmt(NUMBERFMTW *fmt, LPWSTR decimal_buffer, int decimal_bu WCHAR *c; GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_ILZERO|LOCALE_RETURN_NUMBER, (LPWSTR)&fmt->LeadingZero, sizeof(fmt->LeadingZero)/sizeof(WCHAR)); - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_INEGNUMBER|LOCALE_RETURN_NUMBER, (LPWSTR)&fmt->LeadingZero, sizeof(fmt->NegativeOrder)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_INEGNUMBER|LOCALE_RETURN_NUMBER, (LPWSTR)&fmt->NegativeOrder, sizeof(fmt->NegativeOrder)/sizeof(WCHAR)); fmt->NumDigits = 0; GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal_buffer, decimal_bufwlen); GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, thousand_buffer, thousand_bufwlen);

1 0

Alexandre Julliard : oleaut32: Use the locale leading zero flag instead of hardcoding it.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: c8fd78317902f80084a626d20aa3dfeb12572b65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8fd78317902f80084a626d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 10:33:21 2022 +0200 oleaut32: Use the locale leading zero flag instead of hardcoding it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/vartype.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 3850fec7066..bc8bd0d2197 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6512,12 +6512,14 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl NUMBERFMTW minFormat; minFormat.NumDigits = 0; - minFormat.LeadingZero = 0; minFormat.Grouping = 0; minFormat.lpDecimalSep = lpDecimalSep; minFormat.lpThousandSep = empty; minFormat.NegativeOrder = 1; /* NLS_NEG_LEFT */ + GetLocaleInfoW(lcid, LOCALE_ILZERO | LOCALE_RETURN_NUMBER | (dwFlags & LOCALE_NOUSEROVERRIDE), + (WCHAR *)&minFormat.LeadingZero, sizeof(DWORD)/sizeof(WCHAR) ); + /* count number of decimal digits in string */ p = wcschr( buff, '.' ); if (p) minFormat.NumDigits = lstrlenW(p + 1);

1 0

Francois Gouget : testbot/cgi: Add CollectionBlock::GetPropertyValue().
by Alexandre Julliard 03 May '22

03 May '22

Module: tools Branch: master Commit: 663642b1fd161e5c08d015eb11891993f7479a9d URL: https://source.winehq.org/git/tools.git/?a=commit;h=663642b1fd161e5c08d015e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 3 19:48:04 2022 +0200 testbot/cgi: Add CollectionBlock::GetPropertyValue(). This is practical for adding support for synthesized columns that have standard values without having to also deal with generating HTML for them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 27 +++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 08844d0..336c7cd 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -173,7 +173,8 @@ By default this matches the property list of the items in the collection and that list is then pruned by DisplayProperty(). However it is possible to redefine this method to reorder the columns or add -extra columns where the values will be synthesized by GenerateDataView(). +extra columns where the values will be synthesized by GetPropertyValue() or +generated directly by GenerateDataView(). =back =cut @@ -311,6 +312,27 @@ sub GenerateHeaderView($$$) =pod =over 12 +=item C<GetPropertyValue()> + +Returns the underlying property value. + +This is useful for providing values for the synthetic columns. +See GenerateDataView(). + +=back +=cut + +sub GetPropertyValue($$$) +{ + my ($self, $Row, $Col) = @_; + + my $PropertyName = $Col->{Descriptor}->GetName(); + return $Row->{Item}->$PropertyName; +} + +=pod +=over 12 + =item C<GenerateDataView()> Generates an HTML snippet representing the property value in a user-readable @@ -346,8 +368,7 @@ sub GenerateDataView($$$) { my ($self, $Row, $Col) = @_; - my $PropertyName = $Col->{Descriptor}->GetName(); - my $Value = $Row->{Item}->$PropertyName; + my $Value = $self->GetPropertyValue($Row, $Col); GenerateValueHTML($self, $Col->{Descriptor}, $Value, $Col->{Format}); }

1 0

Francois Gouget : testbot/cgi: Allow overriding the collection block's property list.
by Alexandre Julliard 03 May '22

03 May '22

Module: tools Branch: master Commit: 38745b4ac3445615c966c4bee226c4b6b2a42548 URL: https://source.winehq.org/git/tools.git/?a=commit;h=38745b4ac3445615c966c4b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 3 19:47:59 2022 +0200 testbot/cgi: Allow overriding the collection block's property list. GetPropertyDescriptors() can now be redefined which allows reordering the item's properties and inserting extra 'synthetic' ones. Neither of these was possible by redefining DisplayProperty(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 594ed56..08844d0 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -161,6 +161,29 @@ sub GenerateErrorPopup($) # Individual item property support # + +=pod +=over 12 + +=item C<GetPropertyDescriptors()> + +Returns the list of columns for the collection table. + +By default this matches the property list of the items in the collection and +that list is then pruned by DisplayProperty(). + +However it is possible to redefine this method to reorder the columns or add +extra columns where the values will be synthesized by GenerateDataView(). + +=back +=cut + +sub GetPropertyDescriptors($) +{ + my ($self) = @_; + return $self->{Collection}->GetPropertyDescriptors(); +} + =pod =over 12 @@ -430,7 +453,7 @@ sub GenerateList($) my ($self) = @_; my $Collection = $self->{Collection}; - my $PropertyDescriptors = $Collection->GetPropertyDescriptors(); + my $PropertyDescriptors = $self->GetPropertyDescriptors(); my $ColIndex = 0; my (@Cols, $HasDT);

1 0

Francois Gouget : testbot/build-patterns: Colorize expanded pattern lines.
by Alexandre Julliard 03 May '22

03 May '22

Module: tools Branch: master Commit: 326ed936c6e8ec9a3233de0bc24cefc8e6419612 URL: https://source.winehq.org/git/tools.git/?a=commit;h=326ed936c6e8ec9a3233de0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 3 19:41:34 2022 +0200 testbot/build-patterns: Colorize expanded pattern lines. This makes it easier to identify which pattern lines were previously hidden when there are a lot of them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/patterns.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/winetest/patterns.js b/winetest/patterns.js index 042620b..65e9cb8 100644 --- a/winetest/patterns.js +++ b/winetest/patterns.js @@ -34,6 +34,11 @@ function expandTest(test) { test.patlines.forEach(patline => { patline.dom.style.display = patline.display; + if (!patline.cb.checked) + { + const label = patline.dom.querySelector('.label'); + label.style.color = 'darkblue'; + } }); test.domexpand.innerHTML = '[-]'; test.domexpand.title = "Apply filters"; @@ -106,6 +111,8 @@ function refreshPage(changes, rerun_checked) { cb.patlines.forEach(patline => { patline.dom.style.display = patline.display; + const label = patline.dom.querySelector('.label'); + label.style.removeProperty('color'); const test = patline.test; test.linecount++; if (test.linecount == 1 && test.id != "summary")

1 0

Francois Gouget : winetest/build-patterns: Use CSS to highlight lines with new failure modes.
by Alexandre Julliard 03 May '22

03 May '22

Module: tools Branch: master Commit: 5502d2ae65055fdeb6a447ed42e271e9e563f18e URL: https://source.winehq.org/git/tools.git/?a=commit;h=5502d2ae65055fdeb6a447e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 3 19:41:26 2022 +0200 winetest/build-patterns: Use CSS to highlight lines with new failure modes. This also makes it possible to programmatically manipulate the pattern line labels. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 5 ++--- winetest/report.css | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 49b08e3..aa6a6e4 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1113,9 +1113,8 @@ sub write_pattern_line($$$) date_range($range_start, $range_end), $range_title, $range_symbol x $range_count; } - my $label = $reportdir; - $label = "<b>$label</b>" if ($has_newmode); - print $html "</div> $label\n</div>"; + my $newmode = $has_newmode ? " newmode" : ""; + print $html "</div> <span class='label$newmode'>$reportdir</span>\n</div>"; } sub index2symbol($) diff --git a/winetest/report.css b/winetest/report.css index be49a05..25f156d 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -91,6 +91,8 @@ div.pattern :link { color: black; text-decoration: none; } div.pattern :visited { color: black; text-decoration: none; } div.pattern :hover { color: black; text-decoration: underline; } +.newmode { font-weight: bold; } + .patA { /* no such test in this build */ background-color: lightgrey; }

1 0

← Newer
1
...
79
80
81
82
83
84
85
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2022