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

Zebediah Figura : user32: Toggle the caret based on the timer ID in DispatchMessage().
by Alexandre Julliard April 21, 2022

April 21, 2022

Module: wine Branch: master Commit: 95378c56b8efa5bdd1822e317995bb096d0bd711 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95378c56b8efa5bdd1822e31… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 20 19:15:29 2022 -0500 user32: Toggle the caret based on the timer ID in DispatchMessage(). Avoid passing a callback to NtUserSetSystemTimer(); it does not support one. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/caret.c | 18 +++++++----------- dlls/user32/user_main.c | 1 + dlls/user32/user_private.h | 1 + dlls/win32u/message.c | 11 +++++++++++ dlls/win32u/ntuser_private.h | 6 ++++++ 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c index 8bf4962b708..708f4e39f97 100644 --- a/dlls/user32/caret.c +++ b/dlls/user32/caret.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "wingdi.h" #include "ntuser.h" +#include "user_private.h" #include "wine/server.h" #include "wine/debug.h" @@ -40,8 +41,6 @@ typedef struct static CARET Caret = { 0, 500 }; -#define TIMERID 0xffff /* system timer id for the caret */ - /***************************************************************** * CARET_DisplayCaret @@ -67,10 +66,7 @@ static void CARET_DisplayCaret( HWND hwnd, const RECT *r ) } -/***************************************************************** - * CARET_Callback - */ -static void CALLBACK CARET_Callback( HWND hwnd, UINT msg, UINT_PTR id, DWORD ctime) +void CDECL toggle_caret( HWND hwnd ) { BOOL ret; RECT r; @@ -183,7 +179,7 @@ BOOL WINAPI CreateCaret( HWND hwnd, HBITMAP bitmap, INT width, INT height ) if (prev && !hidden) /* hide the previous one */ { /* FIXME: won't work if prev belongs to a different process */ - KillSystemTimer( prev, TIMERID ); + KillSystemTimer( prev, SYSTEM_TIMER_CARET ); if (old_state) CARET_DisplayCaret( prev, &r ); } @@ -226,7 +222,7 @@ BOOL WINAPI DestroyCaret(void) if (ret && prev && !hidden) { /* FIXME: won't work if prev belongs to a different process */ - KillSystemTimer( prev, TIMERID ); + KillSystemTimer( prev, SYSTEM_TIMER_CARET ); if (old_state) CARET_DisplayCaret( prev, &r ); } if (Caret.hBmp) DeleteObject( Caret.hBmp ); @@ -274,7 +270,7 @@ BOOL WINAPI SetCaretPos( INT x, INT y ) r.left = x; r.top = y; CARET_DisplayCaret( hwnd, &r ); - NtUserSetSystemTimer( hwnd, TIMERID, Caret.timeout, CARET_Callback ); + NtUserSetSystemTimer( hwnd, SYSTEM_TIMER_CARET, Caret.timeout, NULL ); } return ret; } @@ -314,7 +310,7 @@ BOOL WINAPI HideCaret( HWND hwnd ) if (ret && !hidden) { if (old_state) CARET_DisplayCaret( hwnd, &r ); - KillSystemTimer( hwnd, TIMERID ); + KillSystemTimer( hwnd, SYSTEM_TIMER_CARET ); } return ret; } @@ -352,7 +348,7 @@ BOOL WINAPI ShowCaret( HWND hwnd ) if (ret && (hidden == 1)) /* hidden was 1 so it's now 0 */ { CARET_DisplayCaret( hwnd, &r ); - NtUserSetSystemTimer( hwnd, TIMERID, Caret.timeout, CARET_Callback ); + NtUserSetSystemTimer( hwnd, SYSTEM_TIMER_CARET, Caret.timeout, NULL ); } return ret; } diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 242ee0c90fb..6e0722e4750 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -177,6 +177,7 @@ static const struct user_callbacks user_funcs = rawinput_device_get_usages, register_builtin_classes, SCROLL_SetStandardScrollPainted, + toggle_caret, unpack_dde_message, register_imm, unregister_imm, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 52e57a5e6f1..96c47a71753 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -99,6 +99,7 @@ extern HBRUSH SYSCOLOR_Get55AABrush(void) DECLSPEC_HIDDEN; extern void SYSPARAMS_Init(void) DECLSPEC_HIDDEN; extern void USER_CheckNotLock(void) DECLSPEC_HIDDEN; extern BOOL USER_IsExitingThread( DWORD tid ) DECLSPEC_HIDDEN; +extern void CDECL toggle_caret( HWND hwnd ) DECLSPEC_HIDDEN; typedef LRESULT (*winproc_callback_t)( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg ); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 400cc242156..7b3ad1d1f73 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2469,6 +2469,17 @@ LRESULT dispatch_message( const MSG *msg, BOOL ansi ) __ENDTRY return retval; } + if (msg->message == WM_SYSTIMER) + { + switch (msg->wParam) + { + case SYSTEM_TIMER_CARET: + if (!user_callbacks) break; + user_callbacks->toggle_caret( msg->hwnd ); + return 0; + } + } + if (!msg->hwnd) return 0; spy_enter_message( SPY_DISPATCHMESSAGE, msg->hwnd, msg->message, msg->wParam, msg->lParam ); diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 51c54bbe912..0ca4aef4868 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -51,6 +51,7 @@ struct user_callbacks BOOL (CDECL *rawinput_device_get_usages)(HANDLE handle, USHORT *usage_page, USHORT *usage); void (CDECL *register_builtin_classes)(void); void (WINAPI *set_standard_scroll_painted)( HWND hwnd, INT bar, BOOL visible ); + void (CDECL *toggle_caret)( HWND hwnd ); BOOL (CDECL *unpack_dde_message)( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, void **buffer, size_t size ); BOOL (WINAPI *register_imm)( HWND hwnd ); @@ -60,6 +61,11 @@ struct user_callbacks #define WM_SYSTIMER 0x0118 #define WM_POPUPSYSTEMMENU 0x0313 +enum system_timer_id +{ + SYSTEM_TIMER_CARET = 0xffff, +}; + struct user_object { HANDLE handle;

1 0

Zebediah Figura : user.exe: Implement SetSystemTimer() using SetTimer().
by Alexandre Julliard April 21, 2022

April 21, 2022

Module: wine Branch: master Commit: 33087806a637b608367897310fda4b2b922e974b URL: https://source.winehq.org/git/wine.git/?a=commit;h=33087806a637b60836789731… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 20 19:15:28 2022 -0500 user.exe: Implement SetSystemTimer() using SetTimer(). Avoid using SetSystemTimer() to specify a callback; it does not support one. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/message.c | 5 +++++ dlls/user.exe16/user_private.h | 2 ++ dlls/user.exe16/window.c | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 819d9d9b837..46561d722ed 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -1292,6 +1292,11 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT lParam = MAKELPARAM( 0, convert_handle_32_to_16( lParam, GMEM_DDESHARE )); ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); break; /* FIXME don't know how to free allocated memory (handle) !! */ + case WM_TIMER: + if (wParam & SYSTEM_TIMER_FLAG) + msg = WM_SYSTIMER; + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); + break; case SBM_SETRANGE: ret = callback( HWND_16(hwnd), SBM_SETRANGE16, 0, MAKELPARAM(wParam, lParam), result, arg ); break; diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index 8a325cf9fb2..0805997246b 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -95,6 +95,8 @@ extern void call_WH_CALLWNDPROC_hook( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPAR #define WM_SYSTIMER 0x0118 +#define SYSTEM_TIMER_FLAG 0x10000 + /* Dialog info structure (must match the user32 one) */ typedef struct tagDIALOGINFO { diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index 590b8ae9f7c..e54dd6a803e 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -111,7 +111,7 @@ UINT16 WINAPI SetTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout, TIMERPROC16 pr UINT16 WINAPI SetSystemTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout, TIMERPROC16 proc ) { TIMERPROC proc32 = (TIMERPROC)WINPROC_AllocProc16( (WNDPROC16)proc ); - return SetSystemTimer( WIN_Handle32(hwnd), id, timeout, proc32 ); + return SetTimer( WIN_Handle32(hwnd), (UINT_PTR)id | SYSTEM_TIMER_FLAG, timeout, proc32 ); } @@ -1087,7 +1087,7 @@ void WINAPI SwitchToThisWindow16( HWND16 hwnd, BOOL16 restore ) */ BOOL16 WINAPI KillSystemTimer16( HWND16 hwnd, UINT16 id ) { - return KillSystemTimer( WIN_Handle32(hwnd), id ); + return KillTimer( WIN_Handle32(hwnd), (UINT_PTR)id | SYSTEM_TIMER_FLAG ); }

1 0

Connor McAdams : webservices: Respect session dictionary size limits on send dictionary.
by Alexandre Julliard April 21, 2022

April 21, 2022

Module: wine Branch: master Commit: e2fa62b8fe265ae3ccd70edede6e648cfc0f4a1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2fa62b8fe265ae3ccd70ede… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Apr 21 12:04:50 2022 +0200 webservices: Respect session dictionary size limits on send dictionary. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 21 +++++++++++++++------ dlls/webservices/string.c | 5 ++++- dlls/webservices/webservices_private.h | 4 +++- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 4941844afe5..7dd78335e11 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -327,8 +327,8 @@ static void reset_channel( struct channel *channel ) channel->state = WS_CHANNEL_STATE_CREATED; channel->session_state = SESSION_STATE_UNINITIALIZED; clear_addr( &channel->addr ); - clear_dict( &channel->dict_send ); - clear_dict( &channel->dict_recv ); + init_dict( &channel->dict_send, channel->dict_size ); + init_dict( &channel->dict_recv, 0 ); channel->msg = NULL; channel->read_size = 0; channel->send_size = 0; @@ -485,6 +485,7 @@ static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, channel->u.tcp.socket = -1; channel->encoding = WS_ENCODING_XML_BINARY_SESSION_1; channel->dict_size = 2048; + channel->dict_send.str_bytes_max = channel->dict_size; break; case WS_UDP_CHANNEL_BINDING: @@ -544,6 +545,7 @@ static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, } channel->dict_size = *(ULONG *)prop->value; + channel->dict_send.str_bytes_max = channel->dict_size; break; default: @@ -1615,6 +1617,13 @@ static HRESULT CALLBACK dict_cb( void *state, const WS_XML_STRING *str, BOOL *fo return S_OK; } + if (str->length + dict->str_bytes + 1 > dict->str_bytes_max) + { + WARN( "max string bytes exceeded\n" ); + *found = FALSE; + return hr; + } + if (!(bytes = malloc( str->length ))) return E_OUTOFMEMORY; memcpy( bytes, str->bytes, str->length ); if ((hr = insert_string( dict, bytes, str->length, index, id )) == S_OK) @@ -2184,12 +2193,12 @@ static HRESULT build_dict( const BYTE *buf, ULONG buflen, struct dictionary *dic { if ((hr = read_size( &ptr, buflen, &size )) != S_OK) { - clear_dict( dict ); + init_dict( dict, 0 ); return hr; } if (size > buflen) { - clear_dict( dict ); + init_dict( dict, 0 ); return WS_E_INVALID_FORMAT; } buflen -= size; @@ -2208,7 +2217,7 @@ static HRESULT build_dict( const BYTE *buf, ULONG buflen, struct dictionary *dic if ((hr = insert_string( dict, bytes, size, index, NULL )) != S_OK) { free( bytes ); - clear_dict( dict ); + init_dict( dict, 0 ); return hr; } ptr += size; @@ -2216,7 +2225,7 @@ static HRESULT build_dict( const BYTE *buf, ULONG buflen, struct dictionary *dic return S_OK; error: - clear_dict( dict ); + init_dict( dict, 0 ); return hr; } diff --git a/dlls/webservices/string.c b/dlls/webservices/string.c index 3ecdcea85a4..34e67101e66 100644 --- a/dlls/webservices/string.c +++ b/dlls/webservices/string.c @@ -131,7 +131,7 @@ static HRESULT grow_dict( struct dictionary *dict, ULONG size ) return S_OK; } -void clear_dict( struct dictionary *dict ) +void init_dict( struct dictionary *dict, ULONG str_bytes_max ) { ULONG i; assert( !dict->dict.isConst ); @@ -145,6 +145,8 @@ void clear_dict( struct dictionary *dict ) dict->sequence = NULL; dict->current_sequence = 0; dict->size = 0; + dict->str_bytes = 0; + dict->str_bytes_max = str_bytes_max; } HRESULT insert_string( struct dictionary *dict, unsigned char *data, ULONG len, int i, ULONG *ret_id ) @@ -162,6 +164,7 @@ HRESULT insert_string( struct dictionary *dict, unsigned char *data, ULONG len, dict->dict.strings[id].dictionary = &dict->dict; dict->dict.strings[id].id = id; dict->dict.stringCount++; + dict->str_bytes += len + 1; dict->sequence[id] = dict->current_sequence; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index b352aa52d49..373ab6799a9 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -49,13 +49,15 @@ struct dictionary ULONG size; ULONG current_sequence; ULONG *sequence; + ULONG str_bytes; + ULONG str_bytes_max; }; extern struct dictionary dict_builtin DECLSPEC_HIDDEN; extern const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; int find_string( const struct dictionary *, const unsigned char *, ULONG, ULONG * ) DECLSPEC_HIDDEN; HRESULT insert_string( struct dictionary *, unsigned char *, ULONG, int, ULONG * ) DECLSPEC_HIDDEN; -void clear_dict( struct dictionary * ) DECLSPEC_HIDDEN; +void init_dict( struct dictionary *, ULONG ) DECLSPEC_HIDDEN; HRESULT writer_set_lookup( WS_XML_WRITER *, BOOL ) DECLSPEC_HIDDEN; HRESULT writer_set_dict_callback( WS_XML_WRITER *, WS_DYNAMIC_STRING_CALLBACK, void * ) DECLSPEC_HIDDEN;

1 0

Francois Gouget : testbot/web: Escape the GetTaskURL() ampersands.
by Alexandre Julliard April 21, 2022

April 21, 2022

Module: tools Branch: master Commit: 5c47cafbb319ba7aa70f9e9bf2c75dd00c3ad76c URL: https://source.winehq.org/git/tools.git/?a=commit;h=5c47cafbb319ba7aa70f9e9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 21 16:25:02 2022 +0200 testbot/web: Escape the GetTaskURL() ampersands. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 2 +- testbot/web/Stats.pl | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 5a5a375..a924358 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -238,7 +238,7 @@ EOF $Label .= "/64" if ($Bitness); } } - my $URL = GetTaskURL($VMStatus->{job}->Id, $VMStatus->{step}->No, $VMStatus->{task}->No); + my $URL = $self->escapeHTML(GetTaskURL($VMStatus->{job}->Id, $VMStatus->{step}->No, $VMStatus->{task}->No)); my $Title = $self->escapeHTML($VMStatus->{job}->Remarks); $Label = "<a href='$URL' title='$Title'>$Label</a>"; } diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 3c0fe99..773fe3b 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -147,7 +147,7 @@ sub _GetStatHtml($$;$$) my ($JobId, $StepNo, $TaskNo) = ObjectModel::Collection::SplitKey(undef, $SrcObj->GetFullKey()); if (defined $TaskNo) { - return "<a href='". GetTaskURL($JobId, $StepNo, $TaskNo) ."'>$Value</a>"; + return "<a href='". $Stats->{Page}->escapeHTML(GetTaskURL($JobId, $StepNo, $TaskNo)) ."'>$Value</a>"; } return "<a href='/index.pl#job$JobId'>$Value</a>"; } @@ -174,6 +174,7 @@ sub _GenStatsLine($$$$;$) foreach my $Col (@$ColumnKeys) { my $Stats = $RowStats->{items}->{$Col}; + $Stats->{Page} = $RowStats->{Page}; my $Value = _GetStatHtml($Stats, $StatKey, $RowStats, $Flags); print "<td>$Value</td>\n"; } @@ -205,6 +206,7 @@ sub GenerateBody($) ### Show global statistics my $GlobalStats = $Stats->{global}; + $GlobalStats->{Page} = $self; print "<h2>General statistics</h2>\n"; print "<div class='CollectionBlock'><table>\n"; @@ -251,6 +253,7 @@ sub GenerateBody($) print "<tr><td class='StatSeparator'>Activity</td><td colspan='2'><hr></td></tr>\n"; my $VMsStats = $Stats->{vms}; + $VMsStats->{Page} = $self; _GenGlobalLine($VMsStats, "elapsed", "Activity history", "How far back the activity records go. This is used for the VM and VM host tables."); _GenGlobalLine($GlobalStats, "records.count", "Record count", "The number of activity records."); @@ -264,7 +267,8 @@ sub GenerateBody($) print "<thead><tr><th>Stat</th>\n"; my $HostsStats = $Stats->{hosts}; - my $SortedHosts = [ sort keys %{$Stats->{hosts}->{items}} ]; + $HostsStats->{Page} = $self; + my $SortedHosts = [ sort keys %{$HostsStats->{items}} ]; foreach my $Host (@$SortedHosts) { my $DisplayHost = $Host;

1 0

Francois Gouget : testbot/web: Use ValueFormatter for the Activity page.
by Alexandre Julliard April 21, 2022

April 21, 2022

Module: tools Branch: master Commit: 88f7f8a15ee030939681431baa0aeaed4d0d75f7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=88f7f8a15ee030939681431… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 21 16:28:01 2022 +0200 testbot/web: Use ValueFormatter for the Activity page. Update ValueFormatter and datetime.js to add support for showing the time with the date as a tooltip. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ValueFormatter.pm | 48 ++++++++++++++++++++++++++- testbot/web/Activity.pl | 34 ++++--------------- testbot/web/WineTestBot.css | 1 + testbot/web/js/datetime.js | 13 ++++++++ 4 files changed, 67 insertions(+), 29 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm index 47236c7..62c1499 100644 --- a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm +++ b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm @@ -22,7 +22,8 @@ use strict; package ObjectModel::CGI::ValueFormatter; use Exporter 'import'; -our @EXPORT = qw(GetDateTimeJSFile GenerateDateTime GenerateValueHTML); +our @EXPORT = qw(GetDateTimeJSFile GenerateDateTime + GenerateTimeTipDate GenerateValueHTML); use POSIX qw(strftime); @@ -102,6 +103,51 @@ sub GenerateDateTime($;$$) } } +=pod +=over 12 + +=item C<GenerateTimeTipDate()> + +Show the timestamp's time with the date as a tooltip. + +The timestamp is shown 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 GenerateTimeTipDate($;$$) +{ + my ($Sec1970, $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}timetipdate' timestamp='$Sec1970' ", + strftime("title='%Y-%m-%d'>%H:%M:%S", localtime($Sec1970)), + "</$Tag>"; + } + else + { + print " "; + } +} + # # Property value formatting diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index a924358..ffdf0fe 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -24,9 +24,9 @@ package ActivityPage; use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); -use POSIX qw(strftime); - use ObjectModel::BasicPropertyDescriptor; +use ObjectModel::CGI::ValueFormatter; + use WineTestBot::Config; use WineTestBot::Activity; use WineTestBot::Log; # For Elapsed() @@ -75,16 +75,6 @@ sub GeneratePage($) $self->SUPER::GeneratePage(); } -sub _GetHtmlTime($) -{ - my ($Timestamp) = @_; - return "<noscript><div>", - strftime("<a class='title' title='%d'>%H:%M:%S</a>", localtime($Timestamp)), "</div></noscript>\n" . - "<script type='text/javascript'></script>"; -} - sub _GetHtmlDuration($) { my ($Secs) = @_; @@ -110,25 +100,11 @@ sub GenerateBody($) $self->GenerateFormStart(); print "<div class='ItemProperty'><label>Analyze the activity of the past <div class='ItemValue'><input type='text' name='Hours' maxlength='3' size='3' value='", $self->GetParam("Hours"), "'/></div> hours.</label></div>\n"; $self->GenerateFormEnd(); + $self->GenerateImportJS(GetDateTimeJSFile()); print "<h1>${ProjectName} Test Bot activity</h1>\n"; print "<div class='Content'>\n"; - print <<"EOF"; -<script type='text/javascript'></script> -EOF - ### Get the sorted VMs list my $VMs = CreateVMs(); @@ -162,7 +138,9 @@ EOF next if (!$Group->{statusvms}); my $GroupId = $Group->{id}; - print "<tr><td id='g$GroupId'>", _GetHtmlTime($Group->{start}), "</td>"; + print "<tr><td id='g$GroupId'>"; + GenerateTimeTipDate($Group->{start}); + print "</td>"; if ($Group->{engine}) { print "<td class='Record RecordEngine'>$Group->{engine}</td>\n"; diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index a50125f..0955f58 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.timetipdate { color:inherit; text-decoration: none; } th.Record { text-align: center; } td.Record { text-align: center; } diff --git a/testbot/web/js/datetime.js b/testbot/web/js/datetime.js index 8f56719..47b0feb 100644 --- a/testbot/web/js/datetime.js +++ b/testbot/web/js/datetime.js @@ -32,11 +32,24 @@ function ShowDateTime(dom) Pad2(dt.getMinutes()) +':'+ Pad2(dt.getSeconds()) } +function ShowTimeTipDate(dom) +{ + const sec1970 = dom.getAttribute("timestamp"); + const dt = new Date(sec1970 * 1000); + dom.setAttribute('title', dt.getFullYear() +'-'+ Pad2(dt.getMonth() + 1) + +'-'+ Pad2(dt.getDate())); + dom.innerHTML = Pad2(dt.getHours()) +':'+ Pad2(dt.getMinutes()) +':'+ + Pad2(dt.getSeconds()); +} + function init() { document.querySelectorAll(".datetime").forEach(dom => { ShowDateTime(dom); }); + document.querySelectorAll(".timetipdate").forEach(dom => { + ShowTimeTipDate(dom); + }); } window.addEventListener('load', init);

1 0

Francois Gouget : testbot/web: Escape URLs to the user details page.
by Alexandre Julliard April 21, 2022

April 21, 2022

Module: tools Branch: master Commit: b2cdcca7480bc42c49092e5ade20d10b71448da9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b2cdcca7480bc42c49092e5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 21 15:58:42 2022 +0200 testbot/web: Escape URLs to the user details page. It may contain ampersands which should be escaped in HTML documents. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/UsersList.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index dcdb811..ec6d282 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -82,7 +82,7 @@ sub GenerateDataView($$$) { ($Class, $Label) = ('usernone', 'none'); } - my $DetailsLink = $self->GetDetailsLink($Row); + my $DetailsLink = $self->escapeHTML($self->GetDetailsLink($Row)); print "<a href='$DetailsLink'><span class='$Class'>$Label</span></a>"; } else

1 0

Francois Gouget : testbot/web: Tweak the main page's job details links.
by Alexandre Julliard April 21, 2022

April 21, 2022

Module: tools Branch: master Commit: de715c7e3ea1adcc6065325abe0e5a5d14aec0c1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=de715c7e3ea1adcc6065325… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 21 15:59:03 2022 +0200 testbot/web: Tweak the main page's job details links. There is no need to call uri_escape() on integers. But GetDetailsLink() should go through escapeHTML() in case it contains ampersands. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 0b8a9cb..1c506c9 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -26,7 +26,6 @@ use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); use POSIX qw(strftime); -use URI::Escape; use WineTestBot::Branches; use WineTestBot::Users; @@ -89,9 +88,9 @@ sub GenerateDataView($$$) } elsif ($PropertyName eq "Status") { - my $EscapedKey = uri_escape($Row->{Item}->GetKey()); my $DetailsLink = $self->GetDetailsLink($Row); - print "<a id='job$EscapedKey' href='$DetailsLink'>"; + print "<a id='job", $Job->Id, "' href='", $self->escapeHTML($DetailsLink), + "'>"; my %HTMLChunks = ("queued" => "<span class='queued'>queued</span>", "running" => "<span class='running'>running</span>",

1 0

Francois Gouget : testbot/cgi: Handle the timestamp formatting in ValueFormatter.
by Alexandre Julliard April 21, 2022

April 21, 2022

Module: tools Branch: master Commit: 78f2c0fd53ea53647db8157c3b890882bd5d7b95 URL: https://source.winehq.org/git/tools.git/?a=commit;h=78f2c0fd53ea53647db8157… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 21 16:27:58 2022 +0200 testbot/cgi: Handle the timestamp formatting in ValueFormatter. Also move the JavaScript code to a separate file so it does not have to be downloaded with every page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 56 +++----------- testbot/lib/ObjectModel/CGI/ValueFormatter.pm | 101 +++++++++++++++++++++++-- testbot/web/js/datetime.js | 42 ++++++++++ 3 files changed, 148 insertions(+), 51 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index e849d5a..03f1d18 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -44,7 +44,6 @@ package ObjectModel::CGI::CollectionBlock; use Exporter 'import'; our @EXPORT = qw(new); -use POSIX qw(strftime); use URI::Escape; use ObjectModel::CGI::Table; @@ -291,18 +290,7 @@ sub GenerateDataView($$$) my $PropertyName = $PropertyDescriptor->GetName(); my $Value = $Row->{Item}->$PropertyName; - - if ($PropertyDescriptor->GetClass() eq "Basic" and - $PropertyDescriptor->GetType() eq "DT" and defined $Value) - { - print "<script type='text/javascript'></script><noscript><div>", - strftime("%Y-%m-%d %H:%M:%S", localtime($Value)), - "</div></noscript>\n"; - return; - } - print defined $Value ? $self->escapeHTML($Value) : " "; + GenerateValueHTML($self, $PropertyDescriptor, $Value); } @@ -414,42 +402,20 @@ sub GenerateList($) my $Collection = $self->{Collection}; my $PropertyDescriptors = $Collection->GetPropertyDescriptors(); - my $HasDT = !1; - foreach my $PropertyDescriptor (@{$PropertyDescriptors}) + + my $Items = $self->{Collection}->GetSortedItems(); + if (@$Items != 0) { - if ($PropertyDescriptor->GetClass() eq "Basic" && - $PropertyDescriptor->GetType() eq "DT") + foreach my $PropertyDescriptor (@$PropertyDescriptors) { - $HasDT = 1; + if ($PropertyDescriptor->GetClass() eq "Basic" and + $PropertyDescriptor->GetType() eq "DT") + { + $self->{EnclosingPage}->GenerateImportJS(GetDateTimeJSFile()); + last; + } } } - if ($HasDT) - { - print <<"EOF"; -<script type='text/javascript'></script> -EOF - } print "<div class='CollectionBlock'>\n"; $self->GenerateFormStart(); diff --git a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm index cad6eee..47236c7 100644 --- a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm +++ b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm @@ -22,8 +22,90 @@ use strict; package ObjectModel::CGI::ValueFormatter; use Exporter 'import'; -our @EXPORT = qw(GenerateValueHTML); +our @EXPORT = qw(GetDateTimeJSFile GenerateDateTime GenerateValueHTML); +use POSIX qw(strftime); + + +# +# Timestamp formatting +# + +=pod +=over 12 + +=item C<GetDateTimeJSFile()> + +Returns the path to the file containing the JavaScript code to format +timestamps. + +See GenerateDateTime(). + +=back +=cut + +sub GetDateTimeJSFile() +{ + return "/js/datetime.js"; +} + +=pod +=over 12 + +=item C<GenerateDateTime()> + +Returns an HTML snippet that uses the JavaScript ShowDateTime() function +to show a timestamp in ISO 8601 format in the user's local timezone. + +Note that the timestamp will be shown based on the server's timezone in case +JavaScript is disabled. +=over + +=item Sec1970 +The timestamp to display as the number of seconds since the Epoch. + +=item Class +A string containing additional classes for the <span> tag used to show the +date + time. + +=item TagAttrs +A string containing the tag name without the initial bracket, and any +additional attributes except class and timestamp. By default this is 'span'. + +=back +=back +=cut + +sub GenerateDateTime($;$$) +{ + my ($Sec1970, $Class, $TagAttrs) = @_; + + if (defined $Sec1970) + { + my $Tag; + if ($TagAttrs) + { + $Tag = $TagAttrs; + $Tag =~ s/ .*$//; + } + else + { + $TagAttrs = $Tag = "span"; + } + $Class = "$Class " if ($Class); + print "<$TagAttrs class='${Class}datetime' timestamp='$Sec1970'>", + strftime("%Y-%m-%d %H:%M:%S", localtime($Sec1970)), "</$Tag>"; + } + else + { + print " "; + } +} + + +# +# Property value formatting +# =pod =over 12 @@ -44,13 +126,20 @@ sub GenerateValueHTML($$$) { my ($Parent, $PropertyDescriptor, $Value) = @_; - if ($PropertyDescriptor->GetClass() eq "Basic" and - $PropertyDescriptor->GetType() eq "B") + if ($PropertyDescriptor->GetClass() eq "Basic") { - print $Value ? "Yes" : "No"; - return; + if ($PropertyDescriptor->GetType() eq "B") + { + print $Value ? "Yes" : "No"; + return; + } + if ($PropertyDescriptor->GetType() eq "DT") + { + GenerateDateTime($Value); + return; + } } - if ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) + elsif ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) { # Note: This only supports single-key Itemrefs foreach my $ValuePD (@{$Value->GetPropertyDescriptors()}) diff --git a/testbot/web/js/datetime.js b/testbot/web/js/datetime.js new file mode 100644 index 0000000..8f56719 --- /dev/null +++ b/testbot/web/js/datetime.js @@ -0,0 +1,42 @@ +/* Format timestamps + * + * Copyright 2022 Francois Gouget + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +"use strict"; + +function Pad2(n) +{ + return n < 10 ? '0' + n : n; +} + +function ShowDateTime(dom) +{ + 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()) +} + +function init() +{ + document.querySelectorAll(".datetime").forEach(dom => { + ShowDateTime(dom); + }); +} + +window.addEventListener('load', init);

1 0

Francois Gouget : testbot: Shorten the "No patch found" disposition name.
by Alexandre Julliard April 21, 2022

April 21, 2022

Module: tools Branch: master Commit: 2722d165757062d75962150ede3f918f2c8eacd4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2722d165757062d75962150… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 21 15:57:29 2022 +0200 testbot: Shorten the "No patch found" disposition name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 2 +- testbot/tests/TestWTBS | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index d2ac52e..c0768be 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -550,7 +550,7 @@ sub NewPatch($$;$) my $SubjectInfo = $Patch->ParseSubject(); if (@PatchBodies == 0) { - $Patch->Disposition("No patch found"); + $Patch->Disposition("No patch"); } elsif (@PatchBodies > 1) { diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 8067a62..e5cd448 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -1460,7 +1460,7 @@ sub CheckPatches() { ok(($Patch->Subject =~ /NoPatch/ or $Patch->Disposition eq "Reply to a patch series" or - $Patch->Disposition eq "No patch found"), + $Patch->Disposition eq "No patch"), "Found no file for patch ". $Patch->Id .": ". $Patch->Subject) or diag("Disposition=". $Patch->Disposition); }

1 0

Nikolay Sivov : wusa: Remove string duplication helper.
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: wine Branch: master Commit: 7e446ce7e7f88219de46c4b33f465d3e2b7885c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e446ce7e7f88219de46c4b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 20:46:15 2022 +0300 wusa: Remove string duplication helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wusa/main.c | 6 +++--- programs/wusa/manifest.c | 4 ++-- programs/wusa/wusa.h | 8 -------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index 53534628c31..ef7302847cc 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -166,7 +166,7 @@ static BOOL create_directory(const WCHAR *path) static BOOL create_parent_directory(const WCHAR *filename) { - WCHAR *p, *path = strdupW(filename); + WCHAR *p, *path = wcsdup(filename); BOOL ret = FALSE; if (!path) return FALSE; @@ -430,7 +430,7 @@ static struct assembly_entry *lookup_assembly(struct list *manifest_list, struct static WCHAR *get_assembly_source(struct assembly_entry *assembly) { - WCHAR *p, *path = strdupW(assembly->filename); + WCHAR *p, *path = wcsdup(assembly->filename); if (path && (p = wcsrchr(path, '.'))) *p = 0; return path; } @@ -527,7 +527,7 @@ static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *ke if (!wcsicmp(key, L"runtime.inf")) wcscat(path, L"\\inf"); else if (!wcsicmp(key, L"runtime.drivers")) wcscat(path, L"\\drivers"); else if (!wcsicmp(key, L"runtime.wbem")) wcscat(path, L"\\wbem"); - return strdupW(path); + return wcsdup(path); } static WCHAR *expand_expression(struct assembly_entry *assembly, const WCHAR *expression) diff --git a/programs/wusa/manifest.c b/programs/wusa/manifest.c index efd2845c7e2..620da4fc63b 100644 --- a/programs/wusa/manifest.c +++ b/programs/wusa/manifest.c @@ -160,7 +160,7 @@ static WCHAR *get_xml_attribute(IXMLDOMElement *root, const WCHAR *name) VariantInit(&var); if (SUCCEEDED(IXMLDOMElement_getAttribute(root, bstr, &var))) { - ret = (V_VT(&var) == VT_BSTR) ? strdupW(V_BSTR(&var)) : NULL; + ret = (V_VT(&var) == VT_BSTR) ? wcsdup(V_BSTR(&var)) : NULL; VariantClear(&var); } SysFreeString(bstr); @@ -554,7 +554,7 @@ struct assembly_entry *load_manifest(const WCHAR *filename) if ((entry = alloc_assembly())) { - entry->filename = strdupW(filename); + entry->filename = wcsdup(filename); entry->displayname = get_xml_attribute(root, L"displayName"); if (iter_assembly(root, entry)) goto done; free_assembly(entry); diff --git a/programs/wusa/wusa.h b/programs/wusa/wusa.h index da679a27f07..e61fc025e09 100644 --- a/programs/wusa/wusa.h +++ b/programs/wusa/wusa.h @@ -100,14 +100,6 @@ static inline WCHAR *strdupAtoW(const char *str) return ret; } -static inline WCHAR *strdupW(const WCHAR *str) -{ - WCHAR *ret; - if (!str) return NULL; - if ((ret = malloc((lstrlenW(str) + 1) * sizeof(WCHAR)))) lstrcpyW(ret, str); - return ret; -} - static inline WCHAR *strdupWn(const WCHAR *str, DWORD len) { WCHAR *ret;

1 0