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

Connor McAdams : webservices: Set proper minor version for .NET Message Framing Protocol.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: aaf02584addc0f6e73ea7077d9826e4caff6803d URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaf02584addc0f6e73ea7077… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Apr 13 10:40:29 2022 -0400 webservices: Set proper minor version for .NET Message Framing Protocol. According to MC-NMF, the .Net Framing Protocol, "An implementation conforming to this specification MUST set this field to 0x00." 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index a9142bedee9..1148744346c 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1415,7 +1415,7 @@ static enum known_encoding map_channel_encoding( struct channel *channel ) } #define FRAME_VERSION_MAJOR 1 -#define FRAME_VERSION_MINOR 1 +#define FRAME_VERSION_MINOR 0 static HRESULT write_preamble( struct channel *channel ) {

1 0

Huw Davies : wineoss: Move start to the unixlib.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: cc8e8bc6920aa8999c55ffe1a744ad9c3983e934 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc8e8bc6920aa8999c55ffe1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 13 07:38:49 2022 +0100 wineoss: Move start to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 24 +++++------------------- dlls/wineoss.drv/oss.c | 19 +++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 7 +++++++ 3 files changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 8f2b19c8faa..e50a7b32338 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -934,7 +934,7 @@ static void silence_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 frame static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); - struct oss_stream *stream = This->stream; + struct start_params params; TRACE("(%p)\n", This); @@ -945,31 +945,17 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) return AUDCLNT_E_NOT_INITIALIZED; } - oss_lock(stream); - - if((stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !stream->event){ - oss_unlock(stream); - LeaveCriticalSection(&g_sessions_lock); - return AUDCLNT_E_EVENTHANDLE_NOT_SET; - } - - if(stream->playing){ - oss_unlock(stream); - LeaveCriticalSection(&g_sessions_lock); - return AUDCLNT_E_NOT_STOPPED; - } + params.stream = This->stream; + OSS_CALL(start, &params); - if(!This->timer_thread){ + if(SUCCEEDED(params.result) && !This->timer_thread){ This->timer_thread = CreateThread(NULL, 0, timer_thread, This->stream, 0, NULL); SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); } - stream->playing = TRUE; - - oss_unlock(stream); LeaveCriticalSection(&g_sessions_lock); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index b0dc22a500f..241b6d014ec 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -627,6 +627,24 @@ static NTSTATUS release_stream(void *args) return STATUS_SUCCESS; } +static NTSTATUS start(void *args) +{ + struct start_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + + if((stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !stream->event) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_EVENTHANDLE_NOT_SET); + + if(stream->playing) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_NOT_STOPPED); + + stream->playing = TRUE; + + return oss_unlock_result(stream, &params->result, S_OK); +} + static void silence_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 frames) { WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; @@ -989,6 +1007,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_endpoint_ids, create_stream, release_stream, + start, timer_loop, is_format_supported, get_mix_format, diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 2902bceb949..7418261282d 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -90,6 +90,12 @@ struct release_stream_params HRESULT result; }; +struct start_params +{ + struct oss_stream *stream; + HRESULT result; +}; + struct timer_loop_params { struct oss_stream *stream; @@ -140,6 +146,7 @@ enum oss_funcs oss_get_endpoint_ids, oss_create_stream, oss_release_stream, + oss_start, oss_timer_loop, oss_is_format_supported, oss_get_mix_format,

1 0

Zebediah Figura : include: Add amva.h.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 341a085fa446b50134af3dbe63efc8b71ce3e534 URL: https://source.winehq.org/git/wine.git/?a=commit;h=341a085fa446b50134af3dbe… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 13 17:01:59 2022 -0500 include: Add amva.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/amva.h | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 047e7ff9146..c76e2ec7d0d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -14,6 +14,7 @@ SOURCES = \ amaudio.h \ amsi.idl \ amstream.idl \ + amva.h \ amvideo.idl \ appcompatapi.h \ appmgmt.h \ diff --git a/include/amva.h b/include/amva.h new file mode 100644 index 00000000000..faf103270fc --- /dev/null +++ b/include/amva.h @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2022 Zebediah Figura for CodeWeavers + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __AMVA_INCLUDED__ +#define __AMVA_INCLUDED__ + +typedef struct _tag_AMVABeginFrameInfo +{ + DWORD dwDestSurfaceIndex; + void *pInputData; + DWORD dwSizeInputData; + void *pOutputData; + DWORD dwSizeOutputData; +} AMVABeginFrameInfo, *LPAMVABeginFrameInfo; + +typedef struct _tag_AMVABUFFERINFO +{ + DWORD dwTypeIndex; + DWORD dwBufferIndex; + DWORD dwDataOffset; + DWORD dwDataSize; +} AMVABUFFERINFO, *LPAMVABUFFERINFO; + +typedef struct _tag_AMVACompBufferInfo +{ + DWORD dwNumCompBuffers; + DWORD dwWidthToCreate; + DWORD dwHeightToCreate; + DWORD dwBytesToAllocate; + DDSCAPS2 ddCompCaps; + DDPIXELFORMAT ddPixelFormat; +} AMVACompBufferInfo, *LPAMVACompBufferInfo; + +typedef struct _tag_AMVAEndFrameInfo +{ + DWORD dwSizeMiscData; + void *pMiscData; +} AMVAEndFrameInfo, *LPAMVAEndFrameInfo; + +typedef struct _tag_AMVAInternalMemInfo +{ + DWORD dwScratchMemAlloc; +} AMVAInternalMemInfo, *LPAMVAInternalMemInfo; + +typedef struct _tag_AMVAUncompBufferInfo +{ + DWORD dwMinNumSurfaces; + DWORD dwMaxNumSurfaces; + DDPIXELFORMAT ddUncompPixelFormat; +} AMVAUncompBufferInfo, *LPAMVAUncompBufferInfo; + +typedef struct _tag_AMVAUncompDataInfo +{ + DWORD dwUncompWidth; + DWORD dwUncompHeight; + DDPIXELFORMAT ddUncompPixelFormat; +} AMVAUncompDataInfo, *LPAMVAUncompDataInfo; + +#endif

1 0

Jacek Caban : win32u: Move NtUserExcludeUpdateRgn implementation from user32.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 52ff3a3094f7a8e9d50cb0170d6d98714795c29a URL: https://source.winehq.org/git/wine.git/?a=commit;h=52ff3a3094f7a8e9d50cb017… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 14 14:10:15 2022 +0200 win32u: Move NtUserExcludeUpdateRgn implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 25 ------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/dce.c | 24 ++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 8 files changed, 35 insertions(+), 27 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index cabfe471e9d..94e462605dd 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -240,31 +240,6 @@ BOOL WINAPI ValidateRect( HWND hwnd, const RECT *rect ) } -/*********************************************************************** - * ExcludeUpdateRgn (USER32.@) - */ -INT WINAPI ExcludeUpdateRgn( HDC hdc, HWND hwnd ) -{ - HRGN update_rgn = CreateRectRgn( 0, 0, 0, 0 ); - INT ret = NtUserGetUpdateRgn( hwnd, update_rgn, FALSE ); - - if (ret != ERROR) - { - DPI_AWARENESS_CONTEXT context; - POINT pt; - - context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); - GetDCOrgEx( hdc, &pt ); - MapWindowPoints( 0, hwnd, &pt, 1 ); - OffsetRgn( update_rgn, -pt.x, -pt.y ); - ret = ExtSelectClipRgn( hdc, update_rgn, RGN_DIFF ); - SetThreadDpiAwarenessContext( context ); - } - DeleteObject( update_rgn ); - return ret; -} - - static INT scroll_window( HWND hwnd, INT dx, INT dy, const RECT *rect, const RECT *clipRect, HRGN hrgnUpdate, LPRECT rcUpdate, UINT flags, BOOL is_ex ) { diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index af63ae007a1..fcc17aae18e 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -237,7 +237,7 @@ @ stdcall EnumWindowStationsW(ptr long) @ stdcall EnumWindows(ptr long) @ stdcall EqualRect(ptr ptr) -@ stdcall ExcludeUpdateRgn(long long) +@ stdcall ExcludeUpdateRgn(long long) NtUserExcludeUpdateRgn @ stdcall ExitWindowsEx(long long) @ stdcall FillRect(long ptr long) @ stdcall FindWindowA(str str) diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index f0545c8bba4..740c7441a49 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -1546,3 +1546,27 @@ BOOL WINAPI NtUserGetUpdateRect( HWND hwnd, RECT *rect, BOOL erase ) if (need_erase) flags |= UPDATE_DELAYED_ERASE; return get_update_flags( hwnd, NULL, &flags ) && (flags & UPDATE_PAINT); } + +/*********************************************************************** + * NtUserExcludeUpdateRgn (win32u.@) + */ +INT WINAPI NtUserExcludeUpdateRgn( HDC hdc, HWND hwnd ) +{ + HRGN update_rgn = NtGdiCreateRectRgn( 0, 0, 0, 0 ); + INT ret = NtUserGetUpdateRgn( hwnd, update_rgn, FALSE ); + + if (ret != ERROR) + { + DPI_AWARENESS_CONTEXT context; + POINT pt; + + context = set_thread_dpi_awareness_context( get_window_dpi_awareness_context( hwnd )); + NtGdiGetDCPoint( hdc, NtGdiGetDCOrg, &pt ); + map_window_points( 0, hwnd, &pt, 1, get_thread_dpi() ); + NtGdiOffsetRgn( update_rgn, -pt.x, -pt.y ); + ret = NtGdiExtSelectClipRgn( hdc, update_rgn, RGN_DIFF ); + set_thread_dpi_awareness_context( context ); + } + NtGdiDeleteObjectApp( update_rgn ); + return ret; +} diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index d71807c8c04..d5538848a4f 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1155,6 +1155,7 @@ static struct unix_funcs unix_funcs = NtUserEnumDisplayDevices, NtUserEnumDisplayMonitors, NtUserEnumDisplaySettings, + NtUserExcludeUpdateRgn, NtUserFlashWindowEx, NtUserGetAsyncKeyState, NtUserGetClassInfoEx, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 8c2073d0fb1..0bc95daafc8 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -879,7 +879,7 @@ @ stdcall NtUserEnumDisplayMonitors(long ptr ptr long) @ stdcall NtUserEnumDisplaySettings(ptr long ptr long) @ stub NtUserEvent -@ stub NtUserExcludeUpdateRgn +@ stdcall NtUserExcludeUpdateRgn(long long) @ stub NtUserFillWindow @ stdcall -syscall NtUserFindExistingCursorIcon(ptr ptr ptr) @ stub NtUserFindWindowEx diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 1ebb60ad6ca..69ddcc83c47 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -217,6 +217,7 @@ struct unix_funcs BOOL (WINAPI *pNtUserEnumDisplayMonitors)( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ); BOOL (WINAPI *pNtUserEnumDisplaySettings)( UNICODE_STRING *device, DWORD mode, DEVMODEW *dev_mode, DWORD flags ); + INT (WINAPI *pNtUserExcludeUpdateRgn)( HDC hdc, HWND hwnd ); BOOL (WINAPI *pNtUserFlashWindowEx)( FLASHWINFO *info ); SHORT (WINAPI *pNtUserGetAsyncKeyState)( INT key ); ATOM (WINAPI *pNtUserGetClassInfoEx)( HINSTANCE instance, UNICODE_STRING *name, WNDCLASSEXW *wc, diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index f29d78c2c52..b5c2b49ce79 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -852,6 +852,12 @@ BOOL WINAPI NtUserEnumDisplaySettings( UNICODE_STRING *device, DWORD mode, return unix_funcs->pNtUserEnumDisplaySettings( device, mode, dev_mode, flags ); } +INT WINAPI NtUserExcludeUpdateRgn( HDC hdc, HWND hwnd ) +{ + if (!unix_funcs) return ERROR; + return unix_funcs->pNtUserExcludeUpdateRgn( hdc, hwnd ); +} + BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info ) { if (!unix_funcs) return FALSE; diff --git a/include/ntuser.h b/include/ntuser.h index eed7e4e78c2..efabbe64ad7 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -436,6 +436,7 @@ NTSTATUS WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index, BOOL WINAPI NtUserEnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ); BOOL WINAPI NtUserEnumDisplaySettings( UNICODE_STRING *device, DWORD mode, DEVMODEW *dev_mode, DWORD flags ); +INT WINAPI NtUserExcludeUpdateRgn( HDC hdc, HWND hwnd ); HICON WINAPI NtUserFindExistingCursorIcon( UNICODE_STRING *module, UNICODE_STRING *res_name, void *desc ); BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info );

1 0

Huw Davies : wineoss: Move get_buffer_size to the unixlib.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: aa9d07e6306fa4373e7113b14296b420d5effe39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa9d07e6306fa4373e7113b1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 13 07:38:44 2022 +0100 wineoss: Move get_buffer_size to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 12 +++++------- dlls/wineoss.drv/oss.c | 31 +++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 8 ++++++++ 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 2ea3c80f3ca..a2f75d7a479 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -783,7 +783,7 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, UINT32 *frames) { ACImpl *This = impl_from_IAudioClient3(iface); - struct oss_stream *stream = This->stream; + struct get_buffer_size_params params; TRACE("(%p)->(%p)\n", This, frames); @@ -793,15 +793,13 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - oss_lock(stream); - - *frames = stream->bufsize_frames; + params.stream = This->stream; + params.size = frames; + OSS_CALL(get_buffer_size, &params); TRACE("buffer size: %u\n", *frames); - oss_unlock(stream); - - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 628d0c5818a..fdad419abfa 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -70,6 +70,24 @@ static int muldiv( int a, int b, int c ) return ret; } +static void oss_lock(struct oss_stream *stream) +{ + pthread_mutex_lock(&stream->lock); +} + +static void oss_unlock(struct oss_stream *stream) +{ + pthread_mutex_unlock(&stream->lock); +} + +static NTSTATUS oss_unlock_result(struct oss_stream *stream, + HRESULT *result, HRESULT value) +{ + *result = value; + oss_unlock(stream); + return STATUS_SUCCESS; +} + static NTSTATUS test_connect(void *args) { struct test_connect_params *params = args; @@ -732,6 +750,18 @@ static NTSTATUS get_mix_format(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_buffer_size(void *args) +{ + struct get_buffer_size_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + + *params->size = stream->bufsize_frames; + + return oss_unlock_result(stream, &params->result, S_OK); +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, @@ -740,4 +770,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = release_stream, is_format_supported, get_mix_format, + get_buffer_size, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index c0a0b25c374..b57798ef435 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -106,6 +106,13 @@ struct get_mix_format_params HRESULT result; }; +struct get_buffer_size_params +{ + struct oss_stream *stream; + HRESULT result; + UINT32 *size; +}; + enum oss_funcs { oss_test_connect, @@ -114,6 +121,7 @@ enum oss_funcs oss_release_stream, oss_is_format_supported, oss_get_mix_format, + oss_get_buffer_size, }; extern unixlib_handle_t oss_handle;

1 0

Francois Gouget : testbot/cgi: Only refresh pages when the top is visible.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: tools Branch: master Commit: 16ac37ae118b6116f8eb1fdef255a1439e300917 URL: https://source.winehq.org/git/tools.git/?a=commit;h=16ac37ae118b6116f8eb1fd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 14 18:54:21 2022 +0200 testbot/cgi: Only refresh pages when the top is visible. This stops pages from refreshing and losing the scroll position while one is inspecting a log file, looking at old job results, etc. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 47f2da5..6e55316 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -416,11 +416,6 @@ sub GenerateHttpHeaders($) # HTTP/1.0 $Request->headers_out->add("Pragma", "no-cache"); - if ($self->{Refresh}) - { - $self->{Request}->headers_out->add("Refresh", $self->{Refresh}); - } - # Force char set $Request->content_type("text/html; charset=UTF-8"); @@ -462,12 +457,32 @@ EOF } print ">\n"; - print <<EOF; + print "<div id='logo_blurb'>${ProjectName} Test Bot</div>\n"; + if ($self->{Refresh}) + { + print <<EOF; +<script type='text/javascript'> + +</script> +EOF + } + print <<EOF; <div id='tabs'> <ul> <li><a href='//www.winehq.org/'>WineHQ</a></li>

1 0

Francois Gouget : testbot/LibvirtTool: Allow using preconfigured non-live snapshots as a base.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: tools Branch: master Commit: d5d1c8e2cfb234315b91d488f85dfc79d2614373 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d5d1c8e2cfb234315b91d48… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 14 16:59:13 2022 +0200 testbot/LibvirtTool: Allow using preconfigured non-live snapshots as a base. Don't use 'test-live' as a base because we cannot assume that rebooting it will not break its configuration. But do use snapshots such as 'test-adm' as a base. This allows automating the creation of live snapshots for Windows versions where a given option is not supported. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index df7859d..a9622de 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -613,27 +613,34 @@ sub PrepareVM($) } } -sub GetSnapshotConfig($) +sub GetSnapshotConfig($$) { - my ($Config) = @_; - - # Don't stack snapshots. For instance assume the snapshot name is - # 'test-live-fr-FR-tsign' and that 'test-live-fr-FR' already exists - # (typically because it is used by another VM): - # - It's probably better if snapshots are independent from each other. - # - Applying the 'tsign' flag on top of the existing snapshot requires a - # Windows reboot. But format locale changes may not stick across reboots. - # - Stopping the snapshot name parsing when finding an existing snapshot name - # would lose the 'live' flag resulting in an error (or the wrong type of - # snapshot. Avoiding this issue would result in more complexity. - # - Finally snapshot stacking does not seem that useful. - # - A consequence is that the base snapshot should be called 'test' and not - # 'test-live'. + my ($Domain, $Config) = @_; + + # Notes: + # - Don't use a live snapshot as a base snapshot: + # - It's probably better if snapshots are independent from each other. + # - Applying extra options on top of a live snapshot may require a reboot. + # But some locales changes may not survive that. So using, for instance, + # test-fr-FR-live as a base may break the locale. + # - However some options are not supported on all Windows versions. For + # instance 'adm' snapshots cannot be created on Windows 7 so in that case + # it is useful to be able to use a preconfigured test-adm as a base + # snapshot for test-adm-live. + # - Finally, although base snapshots, such as 'test', are presumably powered + # off, 'off' snapshots still create a new snapshot. The difference is that + # the 'test-off' snapshot will have an up-to-date TestAgentd server, the + # right desktop background, etc. while (1) { + if ($Config->{base} !~ /-live\b/ and + $Domain->HasSnapshot($Config->{base})) + { + last; + } if ($Config->{base} =~ s/-([a-z]{2}-[A-Z]{2})$//) { - $Config->{locale} ||= $1; # take only the last match + $Config->{locale} ||= $1; # use the last locale in the snapshot name } elsif ($Config->{base} =~ s/-(adm|live|off|tsign|u8)$//) { @@ -837,7 +844,7 @@ sub Revert() if (!$Domain->HasSnapshot($Config->{base})) { $Config->{create} = 1; - GetSnapshotConfig($Config); + GetSnapshotConfig($Domain, $Config); Debug(join(" ", Elapsed($Start), "Config:", map { "$_=$Config->{$_}" } sort keys %$Config), "\n"); if ($Config->{locale} and $VM->Type !~ /^win(?:32|64)$/) {

1 0

Francois Gouget : testbot: Filter the jobs in GetStatistics().
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: tools Branch: master Commit: 8f4e6c03f9aae9312d18ce0347995442946fc355 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8f4e6c03f9aae9312d18ce0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 14 16:57:57 2022 +0200 testbot: Filter the jobs in GetStatistics(). This reduces the number of Tasks that need to be loaded from the database and processed in order to collect the statistics for short periods of time. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index f757905..d395a12 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -31,6 +31,8 @@ our @EXPORT = qw(GetActivity GetStatistics); use List::Util qw(max); use Scalar::Util qw(weaken); +use ObjectModel::Collection; + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::RecordGroups; @@ -342,9 +344,12 @@ sub GetStatistics($;$) my ($GlobalStats, $HostsStats, $VMsStats) = ({}, {}, {}); - my @JobTimes; my $Jobs = CreateJobs(); my $Cutoff = $Seconds ? (time() - $Seconds) : 0; + $Jobs->AddFilter(FilterOr(FilterNull("Ended"), + FilterValue("Ended", ">=", [$Cutoff]))); + + my @JobTimes; foreach my $Job (@{$Jobs->GetItems()}) { my $CountsAsNew = ($Job->Submitted >= $Cutoff); @@ -372,6 +377,7 @@ sub GetStatistics($;$) $GlobalStats->{"newtasks.count"}++; $HostStats->{"newtasks.count"}++ if ($HostStats); } + # The Task may have ended much earlier than the Job next if (!$Task->Ended or $Task->Ended < $Cutoff); $GlobalStats->{"donetasks.count"}++; $HostStats->{"donetasks.count"}++ if ($HostStats);

1 0

Francois Gouget : testbot/web: Show all the job.time percentiles.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: tools Branch: master Commit: 892646b54fc9a747bedd992a9b816610fb01bfd1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=892646b54fc9a747bedd992… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 14 16:57:20 2022 +0200 testbot/web: Show all the job.time percentiles. And add a bar graph to give a better sense of how the job durations stack up. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Stats.pl | 13 +++++++++---- testbot/web/WineTestBot.css | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 7ef65b3..3c0fe99 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -223,10 +223,15 @@ sub GenerateBody($) _GenGlobalLine($GlobalStats, "busy.elapsed", "Busy \%", "The percentage of wall clock time where the TestBot was busy running jobs."); print "<tr><td class='StatSeparator'>Job times</td><td colspan='2'><hr></td></tr>\n"; - _GenGlobalLine($GlobalStats, "jobs.time.p10", "10%", "10% of the jobs completed within this time."); - _GenGlobalLine($GlobalStats, "jobs.time.p50", "50%", "50% of the jobs completed within this time."); - _GenGlobalLine($GlobalStats, "jobs.time.p90", "90%", "90% of the jobs completed within this time."); - _GenGlobalLine($GlobalStats, "jobs.time.max", "Max", "The slowest job took this long. Note that this is heavily influenced by test storms."); + my $Max = $GlobalStats->{"jobs.time.max"}; + for (my $Percentile = 10; $Percentile < 100; $Percentile += 10) + { + my $Bar = 100 * $GlobalStats->{"jobs.time.p$Percentile"} / $Max; + my $Space = 100 - $Bar; + _GenGlobalLine($GlobalStats, "jobs.time.p$Percentile", "$Percentile%", + "<div class='PercentBar' style='width: ${Bar}px;'> </div><div class='PercentSpace' style='width: ${Space}px;'></div> $Percentile% of the jobs completed within this time."); + } + _GenGlobalLine($GlobalStats, "jobs.time.max", "Max", "<div class='PercentBar' style='width: 100px;'> </div> Duration of the slowest job. Note that this is heavily influenced by test storms."); print "<tr><td class='StatSeparator'>Average times</td><td colspan='2'><hr></td></tr>\n"; _GenGlobalLine($GlobalStats, "jobs.time", "Job completion", "How long it takes to complete a regular job (excluding canceled ones). Note that this is heavily influenced by test storms."); diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 301ba71..53c939e 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -445,3 +445,5 @@ td.Record { text-align: center; } .Record.Record-miss { border-top: thick dashed #ff6600; } td.StatSeparator { color: #601919; font-weight: bold; } +.PercentBar { background-color: #601919; display: inline-block; } +.PercentSpace { display: inline-block; }

1 0

Francois Gouget : testbot/cgi: Clean up CollectionBlock's property handling.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: tools Branch: master Commit: 1f0e5a654d1e59678d093f81a77d3b281743d210 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1f0e5a654d1e59678d093f8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 14 16:58:04 2022 +0200 testbot/cgi: Clean up CollectionBlock's property handling. Delegate generating the inside of a cell to GenerateDataView() such that GenerateDataCell() only deals with the cell itself. Remove GetDisplayValue() and GetEscapedDisplayValue(): CollectionBlocks don't deal with editing so there is no need for access to the 'raw' data. Thus they are both replaced by GenerateDataView(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 251 +++++++++++++++---------- testbot/web/JobDetails.pl | 36 ++-- testbot/web/PatchesList.pl | 14 +- testbot/web/WineTestBot.css | 4 +- testbot/web/admin/UsersList.pl | 14 +- testbot/web/index.pl | 58 +++--- 6 files changed, 210 insertions(+), 167 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=1f0e5a654d1e59678d0…

1 0