March 2017 - Wine-Commits - list.winehq.org

Huw Davies : msi/tests: Clean up the registry in the correct order.
by Alexandre Julliard March 21, 2017

March 21, 2017

Module: wine Branch: master Commit: 582245b5c49452c28a1e6ed30d8935772d368340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=582245b5c49452c28a1e6ed30… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 17 20:16:01 2017 +0000 msi/tests: Clean up the registry in the correct order. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/msi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 46d0b73..ad7fb84 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -11217,18 +11217,18 @@ static void test_MsiEnumPatchesEx_machine(void) ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); delete_key(hpatch, "", access & KEY_WOW64_64KEY); + RegDeleteValueA(hpatch, "State"); RegCloseKey(hpatch); delete_key(udpatch, "", access & KEY_WOW64_64KEY); RegCloseKey(udpatch); + delete_key(udprod, "", access & KEY_WOW64_64KEY); + RegCloseKey(udprod); done: RegDeleteValueA(patches, patch_squashed); RegDeleteValueA(patches, "Patches"); delete_key(patches, "", access & KEY_WOW64_64KEY); RegCloseKey(patches); - RegDeleteValueA(hpatch, "State"); - delete_key(udprod, "", access & KEY_WOW64_64KEY); - RegCloseKey(udprod); delete_key(prodkey, "", access & KEY_WOW64_64KEY); RegCloseKey(prodkey); }

1 0

Hugh McMaster : regedit/tests: Add missing ok() check after RegOpenKeyExA( ).
by Alexandre Julliard March 21, 2017

March 21, 2017

Module: wine Branch: master Commit: e96056a026466083ebd332b9730476c178b6a859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e96056a026466083ebd332b97… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 21 08:47:09 2017 +0000 regedit/tests: Add missing ok() check after RegOpenKeyExA(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index eacb583..b91df5a 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -518,6 +518,7 @@ static void test_comments(void) ";comment\\\n" "\"Wine2\"=\"Line 2\"\n\n"); lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); verify_reg(hkey, "Wine1", REG_SZ, "Line 1", 7, 0); verify_reg(hkey, "Wine2", REG_SZ, "Line 2", 7, 0);

1 0

Piotr Caban : user32: Don't call IsChild with NULL window in EnableWindow.
by Alexandre Julliard March 21, 2017

March 21, 2017

Module: wine Branch: master Commit: a878f0a02ad553b94b78b907715c691507dea501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a878f0a02ad553b94b78b9077… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 21 13:03:55 2017 +0100 user32: Don't call IsChild with NULL window in EnableWindow. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 2 ++ dlls/user32/win.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6e11ff2..915012c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3091,7 +3091,9 @@ static void test_SetFocus(HWND hwnd) ShowWindow(child, SW_SHOW); SetFocus(child); ok( GetFocus() == child, "Focus should be on child %p\n", child ); + SetLastError(0xdeadbeef); EnableWindow(hwnd, FALSE); + ok(GetLastError() == 0xdeadbeef, "got error %u in EnableWindow call\n", GetLastError()); ok( GetFocus() == child, "Focus should still be on child %p\n", child ); EnableWindow(hwnd, TRUE); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4406577..f3b4ef5 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2171,7 +2171,7 @@ BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable ) SetFocus( 0 ); /* A disabled window can't have the focus */ capture_wnd = GetCapture(); - if (hwnd == capture_wnd || IsChild(hwnd, capture_wnd)) + if (capture_wnd && (hwnd == capture_wnd || IsChild(hwnd, capture_wnd))) ReleaseCapture(); /* A disabled window can't capture the mouse */ SendMessageW( hwnd, WM_ENABLE, FALSE, 0 );

1 0

Alex Henrie : ntdll: Implement ProcessVmCounters for Linux.
by Alexandre Julliard March 21, 2017

March 21, 2017

Module: wine Branch: master Commit: bf7a97e5d3482d1ee4130d716f02b870df804040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf7a97e5d3482d1ee4130d716… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Mar 20 22:55:37 2017 -0600 ntdll: Implement ProcessVmCounters for Linux. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 28 ++++++++++++++++++++++++++++ dlls/ntdll/tests/info.c | 5 +---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 8689d9b..9522256 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -131,6 +131,34 @@ static void fill_VM_COUNTERS(VM_COUNTERS* pvmi) #endif } +#elif defined(linux) + +static void fill_VM_COUNTERS(VM_COUNTERS* pvmi) +{ + FILE *f; + char line[256]; + unsigned long value; + + f = fopen("/proc/self/status", "r"); + if (!f) return; + + while (fgets(line, sizeof(line), f)) + { + if (sscanf(line, "VmPeak: %lu", &value)) + pvmi->PeakVirtualSize = (ULONG64)value * 1024; + else if (sscanf(line, "VmSize: %lu", &value)) + pvmi->VirtualSize = (ULONG64)value * 1024; + else if (sscanf(line, "VmHWM: %lu", &value)) + pvmi->PeakWorkingSetSize = (ULONG64)value * 1024; + else if (sscanf(line, "VmRSS: %lu", &value)) + pvmi->WorkingSetSize = (ULONG64)value * 1024; + else if (sscanf(line, "VmSwap: %lu", &value)) + pvmi->PeakPagefileUsage = pvmi->PagefileUsage = (ULONG64)value * 1024; + } + + fclose(f); +} + #else static void fill_VM_COUNTERS(VM_COUNTERS* pvmi) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 448bc64..35e25af 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1078,10 +1078,7 @@ static void test_query_process_vm(void) /* Check if we have some return values */ trace("WorkingSetSize : %ld\n", pvi.WorkingSetSize); - todo_wine - { - ok( pvi.WorkingSetSize > 0, "Expected a WorkingSetSize > 0\n"); - } + ok( pvi.WorkingSetSize > 0, "Expected a WorkingSetSize > 0\n"); } static void test_query_process_io(void)

1 0

Daniel Lehman : msvcrt: Call unwind handlers on intermediate frames during virtual unwind.
by Alexandre Julliard March 21, 2017

March 21, 2017

Module: wine Branch: master Commit: 5a10705f0c57142c6317bfab660d6270116c332c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a10705f0c57142c6317bfab6… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Aug 2 17:16:52 2016 -0700 msvcrt: Call unwind handlers on intermediate frames during virtual unwind. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 3a90a66..80780ae 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -470,14 +470,20 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (rec->ExceptionCode==STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters==6 && rec->ExceptionInformation[0]==(ULONG_PTR)call_catch_block) { - ULONG64 orig_frame = rec->ExceptionInformation[1]; - const cxx_function_descr *descr = (void*)rec->ExceptionInformation[2]; - int end_level = rec->ExceptionInformation[3]; EXCEPTION_RECORD *new_rec = (void*)rec->ExceptionInformation[4]; thread_data_t *data = msvcrt_get_thread_data(); frame_info *cur; - cxx_local_unwind(orig_frame, dispatch, descr, end_level); + if (rec->ExceptionFlags & EH_TARGET_UNWIND) + { + ULONG64 orig_frame = rec->ExceptionInformation[1]; + const cxx_function_descr *orig_descr = (void*)rec->ExceptionInformation[2]; + int end_level = rec->ExceptionInformation[3]; + + cxx_local_unwind(orig_frame, dispatch, orig_descr, end_level); + } + else + cxx_local_unwind(frame, dispatch, descr, -1); /* FIXME: we should only unregister frames registered by call_catch_block here */ for (cur = data->frame_info_head; cur; cur = cur->next)

1 0

Henri Verbeet : wined3d: Use blit_shader.blit_surface() in surface_blt_to_drawable().
by Alexandre Julliard March 21, 2017

March 21, 2017

Module: wine Branch: master Commit: cbede20ae84988dddfb0e3ff24a7b2137b719b0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbede20ae84988dddfb0e3ff2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 20 23:34:13 2017 +0100 wined3d: Use blit_shader.blit_surface() in surface_blt_to_drawable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 38 +++++--------------------------------- 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fcbb8e5..008ca47 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2099,51 +2099,23 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW } /* Context activation is done by the caller. */ -static void surface_blt_to_drawable(const struct wined3d_device *device, - struct wined3d_context *old_ctx, enum wined3d_texture_filter_type filter, +static void surface_blt_to_drawable(struct wined3d_device *device, + struct wined3d_context *context, enum wined3d_texture_filter_type filter, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in) { unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context = old_ctx; struct wined3d_surface *restore_rt = NULL; - RECT src_rect, dst_rect; - - src_rect = *src_rect_in; - dst_rect = *dst_rect_in; - restore_rt = context_get_rt_surface(old_ctx); + restore_rt = context_get_rt_surface(context); if (restore_rt != dst_surface) context = context_acquire(device, dst_texture, dst_sub_resource_idx); else restore_rt = NULL; - gl_info = context->gl_info; - - /* Make sure the surface is up-to-date. This should probably use - * surface_load_location() and worry about the destination surface too, - * unless we're overwriting it completely. */ - wined3d_texture_load(src_texture, context, FALSE); - - /* Activate the destination context, set it up for blitting */ - context_apply_blit_state(context, device); - - if (!wined3d_resource_is_offscreen(&dst_texture->resource)) - surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); - - device->blitter->set_shader(device->blit_priv, context, src_surface, NULL); - - draw_textured_quad(src_surface, context, &src_rect, &dst_rect, filter); - - /* Leave the opengl state valid for blitting */ - device->blitter->unset_shader(context->gl_info); - - if (wined3d_settings.strict_draw_ordering - || (dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture)) - gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ + device->blitter->blit_surface(device, WINED3D_BLIT_OP_COLOR_BLIT, context, + src_surface, src_rect_in, dst_surface, dst_rect_in, NULL, filter); if (restore_rt) context_restore(context, restore_rt);

1 0

Henri Verbeet : wined3d: Inline surface_blt_to_drawable() into ffp_blit_blit_surface().
by Alexandre Julliard March 21, 2017

March 21, 2017

Module: wine Branch: master Commit: 07a6637d7ef48db5ca8acd9e9d21eca0adbc4656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07a6637d7ef48db5ca8acd9e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 20 23:34:11 2017 +0100 wined3d: Inline surface_blt_to_drawable() into ffp_blit_blit_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 60 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 12ed35a..a35feb1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2786,24 +2786,68 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { struct wined3d_texture *src_texture = src_surface->container; + struct wined3d_texture *dst_texture = dst_surface->container; const struct wined3d_gl_info *gl_info = context->gl_info; - - /* Blit from offscreen surface to render target */ - struct wined3d_color_key old_blt_key = src_texture->async.src_blt_color_key; - DWORD old_color_key_flags = src_texture->async.color_key_flags; + struct wined3d_color_key old_blt_key; + DWORD old_color_key_flags; + RECT r; TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface); + old_blt_key = src_texture->async.src_blt_color_key; + old_color_key_flags = src_texture->async.color_key_flags; wined3d_texture_set_color_key(src_texture, WINED3D_CKEY_SRC_BLT, color_key); - if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) + /* Make sure the surface is up-to-date. This should probably use + * surface_load_location() and worry about the destination surface too, + * unless we're overwriting it completely. */ + wined3d_texture_load(src_texture, context, FALSE); + + /* Activate the destination context, set it up for blitting. */ + context_apply_blit_state(context, device); + + if (!wined3d_resource_is_offscreen(&dst_texture->resource)) + { + r = *dst_rect; + surface_translate_drawable_coords(dst_surface, context->win_handle, &r); + dst_rect = &r; + } + + ffp_blit_set(device->blit_priv, context, src_surface, NULL); + + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST || color_key) + { gl_info->gl_ops.gl.p_glEnable(GL_ALPHA_TEST); + checkGLcall("glEnable(GL_ALPHA_TEST)"); + } + + if (color_key) + { + /* For P8 surfaces, the alpha component contains the palette index. + * Which means that the colorkey is one of the palette entries. In + * other cases pixels that should be masked away have alpha set to 0. */ + if (src_texture->resource.format->id == WINED3DFMT_P8_UINT) + gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, + (float)src_texture->async.src_blt_color_key.color_space_low_value / 255.0f); + else + gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, 0.0f); + checkGLcall("glAlphaFunc"); + } - surface_blt_to_drawable(device, context, filter, - !!color_key, src_surface, src_rect, dst_surface, dst_rect); + draw_textured_quad(src_surface, context, src_rect, dst_rect, filter); - if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST || color_key) + { gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); + checkGLcall("glDisable(GL_ALPHA_TEST)"); + } + + /* Leave the OpenGL state valid for blitting. */ + ffp_blit_unset(gl_info); + + if (wined3d_settings.strict_draw_ordering + || (dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture)) + gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ /* Restore the color key parameters */ wined3d_texture_set_color_key(src_texture, WINED3D_CKEY_SRC_BLT,

1 0

Henri Verbeet : wined3d: Get rid of the (now) redundant "alpha_test" parameter to surface_blt_to_drawable().
by Alexandre Julliard March 21, 2017

March 21, 2017

Module: wine Branch: master Commit: 8c9990157dbca8f81c26cbccb9d3136059e7c9aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c9990157dbca8f81c26cbccb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 20 23:34:12 2017 +0100 wined3d: Get rid of the (now) redundant "alpha_test" parameter to surface_blt_to_drawable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a35feb1..fcbb8e5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2100,8 +2100,7 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW /* Context activation is done by the caller. */ static void surface_blt_to_drawable(const struct wined3d_device *device, - struct wined3d_context *old_ctx, - enum wined3d_texture_filter_type filter, BOOL alpha_test, + struct wined3d_context *old_ctx, enum wined3d_texture_filter_type filter, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in) { @@ -2137,35 +2136,8 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, device->blitter->set_shader(device->blit_priv, context, src_surface, NULL); - if (alpha_test) - { - gl_info->gl_ops.gl.p_glEnable(GL_ALPHA_TEST); - checkGLcall("glEnable(GL_ALPHA_TEST)"); - - /* For P8 surfaces, the alpha component contains the palette index. - * Which means that the colorkey is one of the palette entries. In - * other cases pixels that should be masked away have alpha set to 0. */ - if (src_texture->resource.format->id == WINED3DFMT_P8_UINT) - gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, - (float)src_texture->async.src_blt_color_key.color_space_low_value / 255.0f); - else - gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, 0.0f); - checkGLcall("glAlphaFunc"); - } - else - { - gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); - checkGLcall("glDisable(GL_ALPHA_TEST)"); - } - draw_textured_quad(src_surface, context, &src_rect, &dst_rect, filter); - if (alpha_test) - { - gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); - checkGLcall("glDisable(GL_ALPHA_TEST)"); - } - /* Leave the opengl state valid for blitting */ device->blitter->unset_shader(context->gl_info); @@ -2413,7 +2385,7 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, surface_get_rect(surface, NULL, &r); wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); surface_blt_to_drawable(texture->resource.device, context, - WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r); + WINED3D_TEXF_POINT, surface, &r, surface, &r); return TRUE; }

1 0

Francois Gouget : winetest/build-index: The system locale should not impact the date formatting code.
by Alexandre Julliard March 21, 2017

March 21, 2017

Module: tools Branch: master Commit: 6c5dbad3630f5860e8fb0bbea56e335f638d2c99 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6c5dbad3630f5860e8fb0bbe… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 21 00:08:41 2017 +0100 winetest/build-index: The system locale should not impact the date formatting code. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/winetest/build-index b/winetest/build-index index 9a67d15..e811b62 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -62,7 +62,8 @@ sub get_build_info($) return ($date, $subject); } -use POSIX qw(strftime); +use POSIX qw(locale_h strftime); +setlocale(LC_ALL, "C"); sub short_date($) {

1 0

Francois Gouget : testbot/WineSendLog: Simplify the detection of timeout errors.
by Alexandre Julliard March 21, 2017

March 21, 2017

Module: tools Branch: master Commit: 349eb70c3d21809d613f8f3cc15322b7a14da332 URL: http://source.winehq.org/git/tools.git/?a=commit;h=349eb70c3d21809d613f8f3c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 20 23:57:22 2017 +0100 testbot/WineSendLog: Simplify the detection of timeout errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 983ae37..922811d 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -104,8 +104,7 @@ sub ReadLog($$$) $Line =~ s/[\r\n]*$//; if ($Line =~ m/${BaseName}:${TestSet} done/) { - if ($Line =~ m/${BaseName}:${TestSet} done $(\d+)$/ && - $1 eq "258") + if ($Line =~ m/${BaseName}:${TestSet} done $258$/) { $Messages[@Messages] = "The test timed out"; }

1 0