July 2018 - Wine-Commits - list.winehq.org

Alexandre Julliard : server: Clip visible region to the surface rectangle instead of the desktop.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: 6ccb94392a8ef4bca701ae2a560f4ea1da677edd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ccb94392a8ef4bca701ae2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 11 10:02:45 2018 +0200 server: Clip visible region to the surface rectangle instead of the desktop. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/window.c | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/server/window.c b/server/window.c index 47e8c25..2a0acb8 100644 --- a/server/window.c +++ b/server/window.c @@ -951,6 +951,17 @@ static void set_region_client_rect( struct region *region, struct window *win ) rectangle_t rect; intersect_rect( &rect, &win->window_rect, &win->client_rect ); + intersect_rect( &rect, &rect, &win->surface_rect ); + set_region_rect( region, &rect ); +} + + +/* set the region to the visible rect clipped by the window surface, in parent-relative coordinates */ +static void set_region_visible_rect( struct region *region, struct window *win ) +{ + rectangle_t rect; + + intersect_rect( &rect, &win->visible_rect, &win->surface_rect ); set_region_rect( region, &rect ); } @@ -976,16 +987,22 @@ static struct region *get_visible_region( struct window *win, unsigned int flags if (!is_visible( win )) return region; /* empty region */ + if (is_desktop_window( win )) + { + set_region_rect( region, &win->window_rect ); + return region; + } + /* create a region relative to the window itself */ - if ((flags & DCX_PARENTCLIP) && win->parent && !is_desktop_window(win->parent)) + if ((flags & DCX_PARENTCLIP) && !is_desktop_window( win->parent )) { set_region_client_rect( region, win->parent ); offset_region( region, -win->parent->client_rect.left, -win->parent->client_rect.top ); } else if (flags & DCX_WINDOW) { - set_region_rect( region, &win->visible_rect ); + set_region_visible_rect( region, win ); if (win->win_region && !intersect_window_region( region, win )) goto error; } else @@ -998,42 +1015,29 @@ static struct region *get_visible_region( struct window *win, unsigned int flags if (flags & DCX_CLIPCHILDREN) { - if (is_desktop_window(win)) offset_x = offset_y = 0; - else - { - offset_x = win->client_rect.left; - offset_y = win->client_rect.top; - } - if (!clip_children( win, NULL, region, offset_x, offset_y )) goto error; + if (!clip_children( win, NULL, region, win->client_rect.left, win->client_rect.top )) goto error; } /* clip siblings of ancestors */ - if (is_desktop_window(win)) offset_x = offset_y = 0; - else - { - offset_x = win->window_rect.left; - offset_y = win->window_rect.top; - } + offset_x = win->window_rect.left; + offset_y = win->window_rect.top; if ((tmp = create_empty_region()) != NULL) { - while (win->parent) + while (!is_desktop_window( win->parent )) { /* we don't clip out top-level siblings as that's up to the native windowing system */ - if ((win->style & WS_CLIPSIBLINGS) && !is_desktop_window( win->parent )) + if (win->style & WS_CLIPSIBLINGS) { if (!clip_children( win->parent, win, region, 0, 0 )) goto error; if (is_region_empty( region )) break; } /* clip to parent client area */ win = win->parent; - if (!is_desktop_window(win)) - { - offset_x += win->client_rect.left; - offset_y += win->client_rect.top; - offset_region( region, win->client_rect.left, win->client_rect.top ); - } + offset_x += win->client_rect.left; + offset_y += win->client_rect.top; + offset_region( region, win->client_rect.left, win->client_rect.top ); set_region_client_rect( tmp, win ); if (win->win_region && !intersect_window_region( tmp, win )) goto error; if (!intersect_region( region, region, tmp )) goto error;

1 0

Alexandre Julliard : server: Return the surface rect as top clipping rect.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: 766287ad6adcca090d7b718031e0c1e8a424d185 URL: https://source.winehq.org/git/wine.git/?a=commit;h=766287ad6adcca090d7b7180… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 11 15:20:56 2018 +0200 server: Return the surface rect as top clipping rect. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 7 +------ dlls/user32/painting.c | 2 +- server/window.c | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 1aa67f3..2c4d7d0 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -572,7 +572,6 @@ void dibdrv_set_window_surface( DC *dc, struct window_surface *surface ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; - RECT rect; void *bits; PHYSDEV windev; struct windrv_physdev *physdev; @@ -599,12 +598,8 @@ void dibdrv_set_window_surface( DC *dc, struct window_surface *surface ) dibdrv = physdev->dibdrv; bits = surface->funcs->get_info( surface, info ); init_dib_info_from_bitmapinfo( &dibdrv->dib, info, bits ); - /* clip the device rect to the surface */ - rect = surface->rect; - offset_rect( &rect, dc->device_rect.left, dc->device_rect.top ); - intersect_rect( &dc->device_rect, &dc->device_rect, &rect ); dibdrv->dib.rect = dc->vis_rect; - offset_rect( &dibdrv->dib.rect, -rect.left, -rect.top ); + offset_rect( &dibdrv->dib.rect, -dc->device_rect.left, -dc->device_rect.top ); dibdrv->bounds = surface->funcs->get_bounds( surface ); DC_InitDC( dc ); } diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 9178b61..665e1c0 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -179,7 +179,7 @@ static void update_visible_region( struct dce *dce ) } } - if (!surface) top_rect = get_virtual_screen_rect(); + if (!surface) SetRectEmpty( &top_rect ); __wine_set_visible_region( dce->hdc, vis_rgn, &win_rect, &top_rect, surface ); if (surface) window_surface_release( surface ); } diff --git a/server/window.c b/server/window.c index 2a0acb8..e58d7e4 100644 --- a/server/window.c +++ b/server/window.c @@ -2445,7 +2445,7 @@ DECL_HANDLER(get_visible_region) if (data) set_reply_data_ptr( data, reply->total_size ); } reply->top_win = top->handle; - reply->top_rect = top->visible_rect; + reply->top_rect = top->surface_rect; if (!is_desktop_window(win)) {

1 0

Alexandre Julliard : server: Store the surface rectangle in the server.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: 85f81948de1d7fe6d6d16f681a3a7cf8c08a566f URL: https://source.winehq.org/git/wine.git/?a=commit;h=85f81948de1d7fe6d6d16f68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 11 10:01:58 2018 +0200 server: Store the surface rectangle in the server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 15 +++++++++++---- server/window.c | 37 ++++++++++++++++++++----------------- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 659321c..56a5393 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2067,7 +2067,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, WND *win; HWND surface_win = 0, parent = GetAncestor( hwnd, GA_PARENT ); BOOL ret, needs_update = FALSE; - RECT visible_rect, old_visible_rect, old_window_rect, old_client_rect; + RECT visible_rect, old_visible_rect, old_window_rect, old_client_rect, extra_rects[3]; struct window_surface *old_surface, *new_surface = NULL; if (!parent || parent == GetDesktopWindow()) @@ -2111,10 +2111,17 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, req->client.top = client_rect->top; req->client.right = client_rect->right; req->client.bottom = client_rect->bottom; - if (!EqualRect( window_rect, &visible_rect ) || valid_rects) + if (!EqualRect( window_rect, &visible_rect ) || new_surface || valid_rects) { - wine_server_add_data( req, &visible_rect, sizeof(visible_rect) ); - if (valid_rects) wine_server_add_data( req, valid_rects, sizeof(*valid_rects) ); + extra_rects[0] = extra_rects[1] = visible_rect; + if (new_surface) + { + extra_rects[1] = new_surface->rect; + OffsetRect( &extra_rects[1], visible_rect.left, visible_rect.top ); + } + if (valid_rects) extra_rects[2] = valid_rects[0]; + else SetRectEmpty( &extra_rects[2] ); + wine_server_add_data( req, extra_rects, sizeof(extra_rects) ); } if (new_surface) req->paint_flags |= SET_WINPOS_PAINT_SURFACE; if (win->pixel_format) req->paint_flags |= SET_WINPOS_PIXEL_FORMAT; diff --git a/server/window.c b/server/window.c index 532edd8..47e8c25 100644 --- a/server/window.c +++ b/server/window.c @@ -70,6 +70,7 @@ struct window user_handle_t last_active; /* last active popup */ rectangle_t window_rect; /* window rectangle (relative to parent client area) */ rectangle_t visible_rect; /* visible part of window rect (relative to parent client area) */ + rectangle_t surface_rect; /* window surface rectangle (relative to parent client area) */ rectangle_t client_rect; /* client rectangle (relative to parent client area) */ struct region *win_region; /* region for shaped windows (relative to window rect) */ struct region *update_region; /* update region (relative to window rect) */ @@ -510,7 +511,7 @@ static struct window *create_window( struct window *parent, struct window *owner win->prop_alloc = 0; win->properties = NULL; win->nb_extra_bytes = extra_bytes; - win->window_rect = win->visible_rect = win->client_rect = empty_rect; + win->window_rect = win->visible_rect = win->surface_rect = win->client_rect = empty_rect; memset( win->extra_bytes, 0, extra_bytes ); list_init( &win->children ); list_init( &win->unlinked ); @@ -1624,7 +1625,7 @@ static struct region *expose_window( struct window *win, const rectangle_t *old_ static void set_window_pos( struct window *win, struct window *previous, unsigned int swp_flags, const rectangle_t *window_rect, const rectangle_t *client_rect, const rectangle_t *visible_rect, - const rectangle_t *valid_rect ) + const rectangle_t *surface_rect, const rectangle_t *valid_rect ) { struct region *old_vis_rgn = NULL, *exposed_rgn = NULL; const rectangle_t old_window_rect = win->window_rect; @@ -1642,6 +1643,7 @@ static void set_window_pos( struct window *win, struct window *previous, win->window_rect = *window_rect; win->visible_rect = *visible_rect; + win->surface_rect = *surface_rect; win->client_rect = *client_rect; if (!(swp_flags & SWP_NOZORDER) && win->parent) link_window( win, previous ); if (swp_flags & SWP_SHOWWINDOW) win->style |= WS_VISIBLE; @@ -1658,6 +1660,7 @@ static void set_window_pos( struct window *win, struct window *previous, { offset_rect( &child->window_rect, new_size - old_size, 0 ); offset_rect( &child->visible_rect, new_size - old_size, 0 ); + offset_rect( &child->surface_rect, new_size - old_size, 0 ); offset_rect( &child->client_rect, new_size - old_size, 0 ); } } @@ -1738,7 +1741,7 @@ static void set_window_pos( struct window *win, struct window *previous, client_rect->right - old_client_rect.right != x_offset || client_rect->top - old_client_rect.top != y_offset || client_rect->bottom - old_client_rect.bottom != y_offset || - !valid_rect || memcmp( valid_rect, client_rect, sizeof(*client_rect) )); + memcmp( valid_rect, client_rect, sizeof(*client_rect) )); } if (frame_changed || client_changed) @@ -1746,7 +1749,7 @@ static void set_window_pos( struct window *win, struct window *previous, struct region *win_rgn = old_vis_rgn; /* reuse previous region */ set_region_rect( win_rgn, window_rect ); - if (valid_rect) + if (!is_rect_empty( valid_rect )) { /* subtract the valid portion of client rect from the total region */ struct region *tmp = create_empty_region(); @@ -2222,7 +2225,8 @@ DECL_HANDLER(get_window_tree) /* set the position and Z order of a window */ DECL_HANDLER(set_window_pos) { - rectangle_t window_rect, client_rect, visible_rect; + rectangle_t window_rect, client_rect, visible_rect, surface_rect, valid_rect; + const rectangle_t *extra_rects = get_req_data(); struct window *previous = NULL; struct window *top, *win = get_window( req->handle ); unsigned int flags = req->swp_flags; @@ -2269,29 +2273,28 @@ DECL_HANDLER(set_window_pos) return; } - window_rect = visible_rect = req->window; + window_rect = req->window; client_rect = req->client; - if (get_req_data_size() >= sizeof(rectangle_t)) - memcpy( &visible_rect, get_req_data(), sizeof(rectangle_t) ); + if (get_req_data_size() >= sizeof(rectangle_t)) visible_rect = extra_rects[0]; + else visible_rect = window_rect; + if (get_req_data_size() >= 2 * sizeof(rectangle_t)) surface_rect = extra_rects[1]; + else surface_rect = visible_rect; + if (get_req_data_size() >= 3 * sizeof(rectangle_t)) valid_rect = extra_rects[2]; + else valid_rect = empty_rect; if (win->parent && win->parent->ex_style & WS_EX_LAYOUTRTL) { mirror_rect( &win->parent->client_rect, &window_rect ); mirror_rect( &win->parent->client_rect, &visible_rect ); mirror_rect( &win->parent->client_rect, &client_rect ); + mirror_rect( &win->parent->client_rect, &surface_rect ); + mirror_rect( &win->parent->client_rect, &valid_rect ); } win->paint_flags = (win->paint_flags & ~PAINT_CLIENT_FLAGS) | (req->paint_flags & PAINT_CLIENT_FLAGS); if (win->paint_flags & PAINT_HAS_PIXEL_FORMAT) update_pixel_format_flags( win ); - if (get_req_data_size() >= 2 * sizeof(rectangle_t)) - { - rectangle_t valid_rect; - memcpy( &valid_rect, (const rectangle_t *)get_req_data() + 1, sizeof(rectangle_t) ); - if (win->parent && win->parent->ex_style & WS_EX_LAYOUTRTL) - mirror_rect( &win->parent->client_rect, &valid_rect ); - set_window_pos( win, previous, flags, &window_rect, &client_rect, &visible_rect, &valid_rect ); - } - else set_window_pos( win, previous, flags, &window_rect, &client_rect, &visible_rect, NULL ); + set_window_pos( win, previous, flags, &window_rect, &client_rect, + &visible_rect, &surface_rect, &valid_rect ); reply->new_style = win->style; reply->new_ex_style = win->ex_style;

1 0

Zebediah Figura : msi: Avoid starting the RPC server more than once for a given package.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: 5c7cf0a47d9d43b11f84914f5890eae3fd694592 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c7cf0a47d9d43b11f84914f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 10 12:08:44 2018 +0200 msi: Avoid starting the RPC server more than once for a given package. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 46 +++++++++++++++++++++------------------------- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 2 ++ 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index e68528f..af6e9f7 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -572,16 +572,15 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) return r; } -static DWORD WINAPI DllThread( LPVOID arg ) +static DWORD WINAPI custom_client_thread(void *arg) { static const WCHAR msiexecW[] = {'\\','m','s','i','e','x','e','c','.','e','x','e',0}; static const WCHAR argsW[] = {' ','-','E','m','b','e','d','d','i','n','g',' ',0}; - msi_custom_action_info *info; + msi_custom_action_info *info = arg; PROCESS_INFORMATION pi = {0}; STARTUPINFOW si = {0}; WCHAR buffer[MAX_PATH], cmdline[MAX_PATH + 60]; RPC_STATUS status; - GUID *guid = arg; void *cookie; BOOL wow64; DWORD arch; @@ -592,24 +591,28 @@ static DWORD WINAPI DllThread( LPVOID arg ) CoInitializeEx(NULL, COINIT_MULTITHREADED); /* needed to marshal streams */ - status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, endpoint_lrpcW, NULL); - if (status != RPC_S_OK) + if (!info->package->rpc_server_started) { - ERR("RpcServerUseProtseqEp failed: %#x\n", status); - return status; - } + status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + endpoint_lrpcW, NULL); + if (status != RPC_S_OK) + { + ERR("RpcServerUseProtseqEp failed: %#x\n", status); + return status; + } - status = RpcServerRegisterIfEx(s_IWineMsiRemote_v0_0_s_ifspec, NULL, NULL, - RPC_IF_AUTOLISTEN, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL); - if (status != RPC_S_OK) - { - ERR("RpcServerRegisterIfEx failed: %#x\n", status); - return status; + status = RpcServerRegisterIfEx(s_IWineMsiRemote_v0_0_s_ifspec, NULL, NULL, + RPC_IF_AUTOLISTEN, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL); + if (status != RPC_S_OK) + { + ERR("RpcServerRegisterIfEx failed: %#x\n", status); + return status; + } + + info->package->rpc_server_started = 1; } - info = find_action_by_guid(guid); ret = GetBinaryTypeW(info->source, &arch); - release_custom_action_data(info); if (sizeof(void *) == 8 && ret && arch == SCS_32BIT_BINARY) GetSystemWow64DirectoryW(buffer, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); @@ -618,7 +621,7 @@ static DWORD WINAPI DllThread( LPVOID arg ) strcatW(buffer, msiexecW); strcpyW(cmdline, buffer); strcatW(cmdline, argsW); - StringFromGUID2(guid, cmdline + strlenW(cmdline), 39); + StringFromGUID2(&info->guid, cmdline + strlenW(cmdline), 39); if (IsWow64Process(GetCurrentProcess(), &wow64) && wow64 && arch == SCS_64BIT_BINARY) { @@ -634,13 +637,6 @@ static DWORD WINAPI DllThread( LPVOID arg ) CloseHandle(pi.hProcess); CloseHandle(pi.hThread); - status = RpcServerUnregisterIf(s_IWineMsiRemote_v0_0_s_ifspec, NULL, FALSE); - if (status != RPC_S_OK) - { - ERR("RpcServerUnregisterIf failed: %#x\n", status); - return status; - } - CoUninitialize(); TRACE("custom action (%x) returned %i\n", GetCurrentThreadId(), rc ); @@ -671,7 +667,7 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( list_add_tail( &msi_pending_custom_actions, &info->entry ); LeaveCriticalSection( &msi_custom_action_cs ); - info->handle = CreateThread( NULL, 0, DllThread, &info->guid, 0, NULL ); + info->handle = CreateThread(NULL, 0, custom_client_thread, info, 0, NULL); if (!info->handle) { /* release both references */ diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 789d541..6304375 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -449,6 +449,7 @@ typedef struct tagMSIPACKAGE unsigned char need_reboot_at_end : 1; unsigned char need_reboot_now : 1; unsigned char need_rollback : 1; + unsigned char rpc_server_started : 1; } MSIPACKAGE; typedef struct tagMSIPREVIEW diff --git a/dlls/msi/package.c b/dlls/msi/package.c index d6f22d0..9569c4f 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -342,6 +342,8 @@ static void MSI_FreePackage( MSIOBJECTHDR *arg) msiobj_release( &package->db->hdr ); free_package_structures(package); CloseHandle( package->log_file ); + if (package->rpc_server_started) + RpcServerUnregisterIf(s_IWineMsiRemote_v0_0_s_ifspec, NULL, FALSE); if (package->delete_on_close) DeleteFileW( package->localfile ); msi_free( package->localfile );

1 0

Francois Gouget : testbot/web: Hightlight the winediag and X errors.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: tools Branch: master Commit: 16eaec6d1b54bea0b77e521e4dbf225885edb37b URL: https://source.winehq.org/git/tools.git/?a=commit;h=16eaec6d1b54bea0b77e521… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 11 11:31:11 2018 +0200 testbot/web: Hightlight the winediag and X errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 8 +++++++- testbot/web/WineTestBot.css | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 0ef9609..5e6407b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -431,7 +431,13 @@ sub GetLogLineCategory($) { return "error"; } - if ($Line =~ /^BotError:/) + if ($Line =~ /:winediag:/) + { + return "diag"; + } + if ($Line =~ /^BotError:/ or + $Line =~ /^X Error of failed request: / or + $Line =~ / opcode of failed request: /) { return "boterror"; } diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index ae20382..9656254 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -378,6 +378,7 @@ pre .log-todo { color: #d08000; } .log-error { color: red; } .log-boterror { color: #cc0052; } +.log-diag { color: #e56300; } a.title { color:inherit; text-decoration: none; }

1 0

Francois Gouget : testbot: Remove support for the old Step files locations.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: tools Branch: master Commit: 09b3464029ecccf474171e4f6bb884723dd64597 URL: https://source.winehq.org/git/tools.git/?a=commit;h=09b3464029ecccf474171e4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 11 11:35:02 2018 +0200 testbot: Remove support for the old Step files locations. It is no longer needed now that all the existing Jobs follow the new conventions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Steps.pm | 5 ----- testbot/lib/WineTestBot/StepsTasks.pm | 5 ----- 2 files changed, 10 deletions(-) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 9a4ada9..cb2c6ee 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -153,11 +153,6 @@ sub GetFullFileName($) return undef if (!defined $self->FileName); my ($JobId, $StepNo) = @{$self->GetMasterKey()}; - # FIXME: Remove legacy support once no such job remains (so after - # $JobPurgeDays). - my $LegacyPath = "$DataDir/jobs/$JobId/$StepNo/" . $self->FileName; - return $LegacyPath if (-f $LegacyPath); - my $Path = "$DataDir/jobs/$JobId/"; $Path .= $self->PreviousNo ."/" if ($self->PreviousNo); return $Path . $self->FileName; diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index e10cd8c..4675194 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -47,11 +47,6 @@ sub GetFullFileName($) return undef if (!defined $self->FileName); my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; - # FIXME: Remove legacy support once no such job remains (so after - # $JobPurgeDays). - my $LegacyPath = "$DataDir/jobs/$JobId/". $self->StepNo ."/". $self->FileName; - return $LegacyPath if (-f $LegacyPath); - my $Path = "$DataDir/jobs/$JobId/"; $Path .= $self->PreviousNo ."/" if ($self->PreviousNo); return $Path . $self->FileName;

1 0

Francois Gouget : testbot/WineSendLog: Print a message for non-mailing list jobs.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: tools Branch: master Commit: 507d75c0536ef921dcd8a38bccfc3c6cbc97d23e URL: https://source.winehq.org/git/tools.git/?a=commit;h=507d75c0536ef921dcd8a38… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 11 11:31:19 2018 +0200 testbot/WineSendLog: Print a message for non-mailing list jobs. WineSendLog exits early for these. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 29da4a0..f095bce 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -426,7 +426,11 @@ EOF close(SENDMAIL); # This is all for jobs submitted from the website - return if (!defined $Job->Patch); + if (!defined $Job->Patch) + { + Debug("Not a mailing list patch -> all done.\n"); + return; + } # # Build a job summary with only the new errors

1 0

Francois Gouget : testbot/LibvirtTool: Only power off the VM if needed for the revert.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: tools Branch: master Commit: 44456b4f96bc602827244416afe2dbbbb7600d10 URL: https://source.winehq.org/git/tools.git/?a=commit;h=44456b4f96bc60282724441… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 11 11:35:42 2018 +0200 testbot/LibvirtTool: Only power off the VM if needed for the revert. Reverting from a powered off state is sometimes ten times longer than reverting from the current state. But Libvirt/QEmu is buggy and fails to revert if the VM configuration changes. So try the revert first and, if it fails (which is fast), power off + re-revert the VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 39e8c55..e6742f4 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -411,19 +411,25 @@ sub Revert() } $CurrentStatus = "reverting"; - # Some QEmu/KVM versions are buggy and cannot revert a running VM - Debug(Elapsed($Start), " Powering off the VM\n"); + # Revert the VM (and power it on if necessary) my $Domain = $VM->GetDomain(); - my $ErrMessage = $Domain->PowerOff(); + Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "\n"); + my $ErrMessage = $Domain->RevertToSnapshot(); if (defined $ErrMessage) { - LogMsg "Could not power off $VMKey: $ErrMessage\n"; - LogMsg "Trying the revert anyway...\n"; - } + # Libvirt/QEmu is buggy and cannot revert a running VM from one hardware + # configuration to another. So try again after powering off the VM, though + # this can be much slower. + Debug(Elapsed($Start), " Powering off the VM\n"); + $ErrMessage = $Domain->PowerOff(); + if (defined $ErrMessage) + { + FatalError("Could not power off $VMKey: $ErrMessage\n"); + } - # Revert the VM (and power it on if necessary) - Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "\n"); - $ErrMessage = $Domain->RevertToSnapshot(); + Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "... again\n"); + $ErrMessage = $Domain->RevertToSnapshot(); + } if (defined $ErrMessage) { FatalError("Could not revert $VMKey to ". $VM->IdleSnapshot .": $ErrMessage\n");

1 0

Francois Gouget : testbot: Remove the Step::InStaging field.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: tools Branch: master Commit: bd9e99f5c6e62746aaff7b28a217b2ae03ba727e URL: https://source.winehq.org/git/tools.git/?a=commit;h=bd9e99f5c6e62746aaff7b2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 11 11:34:51 2018 +0200 testbot: Remove the Step::InStaging field. It has been replaced by the new Job-based staging mechanism and is not needed anymore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 3 --- testbot/ddl/update38.sql | 4 ++++ testbot/ddl/winetestbot.sql | 1 - testbot/doc/winetestbot-schema.dia | 23 ----------------------- testbot/lib/WineTestBot/Engine/Scheduler.pm | 2 -- testbot/lib/WineTestBot/Patches.pm | 3 --- testbot/lib/WineTestBot/Steps.pm | 29 ----------------------------- testbot/lib/WineTestBot/StepsTasks.pm | 17 +---------------- testbot/web/Submit.pl | 3 --- 9 files changed, 5 insertions(+), 80 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index a570a1b..df5a326 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -207,7 +207,6 @@ sub AddJob($$$) $NewStep->Type("suite"); $NewStep->FileName($LatestBaseName); $NewStep->FileType($Bits == 64 ? "exe64" : "exe32"); - $NewStep->InStaging(!1); # Add a task for each VM my $Tasks = $NewStep->Tasks; @@ -276,7 +275,6 @@ sub AddReconfigJob($) my $BuildStep = $Steps->Add(); $BuildStep->Type("reconfig"); $BuildStep->FileType("none"); - $BuildStep->InStaging(!1); # And a task for each VM my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); @@ -309,7 +307,6 @@ sub AddReconfigJob($) $NewStep->PreviousNo($BuildStep->No); $NewStep->Type("suite"); $NewStep->FileType("none"); - $NewStep->InStaging(!1); foreach my $VMKey (@$SortedKeys) { diff --git a/testbot/ddl/update38.sql b/testbot/ddl/update38.sql new file mode 100644 index 0000000..56f7d11 --- /dev/null +++ b/testbot/ddl/update38.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE Steps + DROP InStaging; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 12b5dea..a6adea8 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -134,7 +134,6 @@ CREATE TABLE Steps Status ENUM('queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped') NOT NULL, FileName VARCHAR(100) NULL, FileType ENUM('none', 'exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL, - InStaging ENUM('Y', 'N') NOT NULL, DebugLevel INT(2) NOT NULL, ReportSuccessfulTests ENUM('Y', 'N') NOT NULL, PRIMARY KEY (JobId, No), diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index 0dbc7f9..d3efcb8 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -1877,29 +1877,6 @@ </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> - <dia:string>#InStaging#</dia:string> - </dia:attribute> - <dia:attribute name="type"> - <dia:string>#BOOL#</dia:string> - </dia:attribute> - <dia:attribute name="comment"> - <dia:string>##</dia:string> - </dia:attribute> - <dia:attribute name="primary_key"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="nullable"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="unique"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="default_value"> - <dia:string>##</dia:string> - </dia:attribute> - </dia:composite> - <dia:composite type="table_attribute"> - <dia:attribute name="name"> <dia:string>#DebugLevel#</dia:string> </dia:attribute> <dia:attribute name="type"> diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 3ed86e2..4d944c9 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -572,8 +572,6 @@ sub _ScheduleTasks($) my $Previous = ""; # Avoid undefined values for hash indices if (!$Step->PreviousNo) { - # The first step may need to get files from the staging area - $Step->HandleStaging() if ($Step->Status eq "queued"); $StepRank = 0; $StepVMs{$Step} = []; } diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index cafd54d..2d553fe 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -182,7 +182,6 @@ sub Submit($$$) my $BuildStep = $NewJob->Steps->Add(); $BuildStep->FileName("patch.diff"); $BuildStep->FileType("patchdlls"); - $BuildStep->InStaging(!1); $BuildStep->Type("build"); $BuildStep->DebugLevel(0); @@ -220,7 +219,6 @@ sub Submit($$$) $FileName .= "64" if ($Bits eq "64"); $NewStep->FileName("$FileName.exe"); $NewStep->FileType("exe$Bits"); - $NewStep->InStaging(!1); # And a task for each VM my $Tasks = $NewStep->Tasks; @@ -248,7 +246,6 @@ sub Submit($$$) my $NewStep = $NewJob->Steps->Add(); $NewStep->FileName("patch.diff"); $NewStep->FileType("patchdlls"); - $NewStep->InStaging(!1); $NewStep->DebugLevel(0); # And a task for each VM diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 71e0447..9a4ada9 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -90,7 +90,6 @@ sub InitializeNew($$) $self->Status("queued"); $self->Type("single"); $self->FileType("none"); - $self->InStaging(1); $self->DebugLevel(1); $self->ReportSuccessfulTests(!1); @@ -164,33 +163,6 @@ sub GetFullFileName($) return $Path . $self->FileName; } -sub HandleStaging($$) -{ - my ($self) = @_; - - # Always at least create the step's directory - my $StepDir = $self->CreateDir(); - return undef if (! $self->InStaging); - - my $FileName = $self->FileName; - if ($FileName !~ m/^[0-9a-z-]+_(.*)$/) - { - return "Can't split staging filename"; - } - my $BaseName = $1; - $self->FileName($BaseName); - my $StagingFileName = "$DataDir/staging/$FileName"; - if (!move($StagingFileName, $self->GetFullFileName())) - { - return "Could not move the staging file: $!"; - } - - $self->InStaging(!1); - my ($ErrProperty, $ErrMessage) = $self->Save(); - - return $ErrMessage; -} - sub UpdateStatus($$) { my ($self, $Skip) = @_; @@ -266,7 +238,6 @@ my @PropertyDescriptors = ( CreateEnumPropertyDescriptor("Type", "Step type", !1, 1, ['suite', 'single', 'build', 'reconfig']), CreateBasicPropertyDescriptor("FileName", "File name", !1, !1, "A", 100), CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['none', 'exe32', 'exe64', 'patchdlls', 'patchprograms']), - CreateBasicPropertyDescriptor("InStaging", "File is in staging area", !1, 1, "B", 1), CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), CreateDetailrefPropertyDescriptor("Tasks", "Tasks", !1, !1, \&CreateTasks), diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 05854bc..e10cd8c 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -145,22 +145,7 @@ sub _initialize($$) $StepTask->Status($Task->Status); $StepTask->VM($Task->VM); $StepTask->Timeout($Task->Timeout); - if ($Step->InStaging) - { - my $FileName = $Step->FileName; - if ($FileName =~ m/^[\da-fA-F]+ (.*)$/) - { - $StepTask->FileName("$1"); - } - else - { - $StepTask->FileName("unknown"); - } - } - else - { - $StepTask->FileName($Step->FileName); - } + $StepTask->FileName($Step->FileName); $StepTask->FileType($Step->FileType); $StepTask->CmdLineArg($Task->CmdLineArg); $StepTask->Started($Task->Started); diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index cb6a124..e207d78 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -801,7 +801,6 @@ sub OnSubmit($) $BuildStep = $Steps->Add(); $BuildStep->FileName($BaseName); $BuildStep->FileType($FileType); - $BuildStep->InStaging(!1); $BuildStep->Type("build"); $BuildStep->DebugLevel(0); @@ -836,7 +835,6 @@ sub OnSubmit($) { $TestStep->FileName($BaseName); } - $TestStep->InStaging(!1); $TestStep->FileType("exe$Bits"); $TestStep->Type("single"); $TestStep->DebugLevel($self->GetParam("DebugLevel")); @@ -874,7 +872,6 @@ sub OnSubmit($) my $WineStep = $Steps->Add(); $WineStep->FileName($BaseName); $WineStep->FileType($FileType); - $WineStep->InStaging(!1); $WineStep->Type("build"); $WineStep->DebugLevel($self->GetParam("DebugLevel")); $WineStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests")));

1 0

Francois Gouget : testbot/LibvirtTool: Remove the duplicate units after the elapsed time.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: tools Branch: master Commit: 8b70c57a3b157a4f3e47e48573781f36303dd745 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8b70c57a3b157a4f3e47e48… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 11 11:30:52 2018 +0200 testbot/LibvirtTool: Remove the duplicate units after the elapsed time. The string returned by PrettyElapsed() already includes the time unit since it's needed for durations over 1 minute to be readable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 91fe053..39e8c55 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -344,7 +344,7 @@ sub Monitor() return 1 if (ChangeStatus("offline", "off", "done")); NotifyAdministrator("The $VMKey VM is working again", "The $VMKey VM started working again after ". - PrettyElapsed($Start) ." seconds."); + PrettyElapsed($Start) ."."); return 0; } } @@ -483,6 +483,6 @@ else Error("Unsupported action $Action!\n"); $Rc = 1; } -LogMsg "$Action on $VMKey completed in ", PrettyElapsed($Start), " s\n"; +LogMsg "$Action on $VMKey completed in ", PrettyElapsed($Start), "\n"; exit $Rc;

1 0