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

Zebediah Figura : setupapi: Only delete unregistered device interfaces when deleting a device.
by Alexandre Julliard Aug. 20, 2018

Aug. 20, 2018

Module: wine Branch: master Commit: 9ccf51e3c12b95d06b5cf8bfffc3b5990977146f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ccf51e3c12b95d06b5cf8bf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Aug 19 15:23:14 2018 -0500 setupapi: Only delete unregistered device interfaces when deleting a device. Fixes a regression introduced by 86d26dded5560d6d8adb195372f0676d1f7229b0. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 4d53bd7..71356e8 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -524,7 +524,7 @@ static void SETUPDI_RemoveDevice(struct device *device) struct device_iface, entry) { list_remove(&iface->entry); - if ((path = get_refstr_key_path(iface))) + if (device->phantom && (path = get_refstr_key_path(iface))) { RegDeleteKeyW(HKEY_LOCAL_MACHINE, path); heap_free(path);

1 0

Daniel Lehman : msvcrt: Don't read past end of string in _strnicoll/ _wcsnicoll.
by Alexandre Julliard Aug. 20, 2018

Aug. 20, 2018

Module: wine Branch: master Commit: eb37e2e482451e4e67cf7de8df5616e444d29278 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb37e2e482451e4e67cf7de8… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Aug 17 18:51:29 2018 +0200 msvcrt: Don't read past end of string in _strnicoll/_wcsnicoll. 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/string.c | 3 ++- dlls/msvcrt/wcs.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 37bc224..b58d56b 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -694,7 +694,8 @@ int CDECL MSVCRT__strnicoll_l( const char* str1, const char* str2, MSVCRT_size_t if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) return strncasecmp(str1, str2, count); return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, - str1, count, str2, count)-CSTR_EQUAL; + str1, MSVCRT_strnlen(str1, count), + str2, MSVCRT_strnlen(str2, count))-CSTR_EQUAL; } /********************************************************************* diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 3b22f62..c2a4474 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -151,7 +151,8 @@ int CDECL MSVCRT__wcsnicoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) return strncmpiW(str1, str2, count); return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, - str1, count, str2, count)-CSTR_EQUAL; + str1, MSVCRT_wcsnlen(str1, count), + str2, MSVCRT_wcsnlen(str2, count))-CSTR_EQUAL; } /*********************************************************************

1 0

Zebediah Figura : xinput: Use DIGCF_PRESENT.
by Alexandre Julliard Aug. 20, 2018

Aug. 20, 2018

Module: wine Branch: master Commit: 8343099ff51a5e398f75789fbec70bc566bac9ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=8343099ff51a5e398f75789f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 16 18:37:41 2018 -0500 xinput: Use DIGCF_PRESENT. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 3c54890..8a35443 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -241,7 +241,7 @@ void HID_find_gamepads(xinput_controller *devices) EnterCriticalSection(&hid_xinput_crit); - device_info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE); + device_info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); data = HeapAlloc(GetProcessHeap(), 0 , sizeof(*data) + detail_size); data->cbSize = sizeof(*data);

1 0

Daniel Lehman : msvcrt/tests: Add tests for _strncoll/_wcsncoll.
by Alexandre Julliard Aug. 20, 2018

Aug. 20, 2018

Module: wine Branch: master Commit: 9aa7a42a9f1b750e91007ff722a3a7867e4f35e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9aa7a42a9f1b750e91007ff7… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Aug 17 18:51:17 2018 +0200 msvcrt/tests: Add tests for _strncoll/_wcsncoll. 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/tests/string.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 744035a..86f49db 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3387,6 +3387,91 @@ static void test__strupr(void) VirtualFree(mem, sizeof(str), MEM_RELEASE); } +static void test__tcsncoll(void) +{ + struct test { + const char *locale; + const char *str1; + const char *str2; + size_t count; + int exp; + }; + static const struct test tests[] = { + { "English", "ABCD", "ABCD", 4, 0 }, + { "English", "ABCD", "ABCD", 10, 0 }, + + { "English", "ABC", "ABCD", 3, 0 }, + { "English", "ABC", "ABCD", 4, -1 }, + { "English", "ABC", "ABCD", 10, -1 }, + + { "English", "ABCD", "ABC", 3, 0 }, + { "English", "ABCD", "ABC", 4, 1 }, + { "English", "ABCD", "ABC", 10, 1 }, + + { "English", "ABCe", "ABCf", 3, 0 }, + { "English", "abcd", "ABCD", 10, -1 }, + + { "C", "ABCD", "ABCD", 4, 0 }, + { "C", "ABCD", "ABCD", 10, 0 }, + + { "C", "ABC", "ABCD", 3, 0 }, + { "C", "ABC", "ABCD", 10, -1 }, + + { "C", "ABCD", "ABC", 3, 0 }, + { "C", "ABCD", "ABC", 10, 1 }, + + { "C", "ABCe", "ABCf", 3, 0 }, + { "C", "abcd", "ABCD", 10, 1 }, + }; + WCHAR str1W[16]; + WCHAR str2W[16]; + char str1[16]; + char str2[16]; + size_t len; + int i, ret; + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + if (!setlocale(LC_ALL, tests[i].locale)) + { + win_skip("%s locale _tcsncoll tests\n", tests[i].locale); + for (; i+1 < ARRAY_SIZE(tests); i++) + if (strcmp(tests[i].locale, tests[i+1].locale)) break; + continue; + } + + memset(str1, 0xee, sizeof(str1)); + strcpy(str1, tests[i].str1); + + memset(str2, 0xff, sizeof(str2)); + strcpy(str2, tests[i].str2); + + ret = _strncoll(str1, str2, tests[i].count); + if (!tests[i].exp) + ok(!ret, "expected 0, got %d for %s, %s, %d\n", ret, str1, str2, (int)tests[i].count); + else if (tests[i].exp < 0) + ok(ret < 0, "expected < 0, got %d for %s, %s, %d\n", ret, str1, str2, (int)tests[i].count); + else + ok(ret > 0, "expected > 0, got %d for %s, %s, %d\n", ret, str1, str2, (int)tests[i].count); + + memset(str1W, 0xee, sizeof(str1W)); + len = mbstowcs(str1W, str1, ARRAY_SIZE(str1W)); + str1W[len] = 0; + + memset(str2W, 0xff, sizeof(str2W)); + len = mbstowcs(str2W, str2, ARRAY_SIZE(str2W)); + str2W[len] = 0; + + ret = _wcsncoll(str1W, str2W, tests[i].count); + if (!tests[i].exp) + ok(!ret, "expected 0, got %d for %s, %s, %d\n", ret, str1, str2, (int)tests[i].count); + else if (tests[i].exp < 0) + ok(ret < 0, "expected < 0, got %d for %s, %s, %d\n", ret, str1, str2, (int)tests[i].count); + else + ok(ret > 0, "expected > 0, got %d for %s, %s, %d\n", ret, str1, str2, (int)tests[i].count); + } +} + START_TEST(string) { char mem[100]; @@ -3510,4 +3595,5 @@ START_TEST(string) test__memicmp(); test__memicmp_l(); test__strupr(); + test__tcsncoll(); }

1 0

Józef Kucia : build: Add a line about demos to the configure summary.
by Alexandre Julliard Aug. 20, 2018

Aug. 20, 2018

Module: vkd3d Branch: master Commit: b5d2374ff320f13e33c9cd42ad427f40a0feacd6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b5d2374ff320f13e33c9cd4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 17 09:56:56 2018 +0200 build: Add a line about demos to the configure summary. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index d437e1b..ddc6c97 100644 --- a/configure.ac +++ b/configure.ac @@ -96,6 +96,7 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_ VKD3D_CHECK_PTHREAD_SETNAME_NP +AS_IF([test "x$enable_demos" != "xyes"], [enable_demos=no]) AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) @@ -113,6 +114,8 @@ AS_ECHO([" Have SPIRV-Tools: ${HAVE_SPIRV_TOOLS} + Building demos: ${enable_demos} + Building crosstests: ${HAVE_CROSSTEST}"]) AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])]) AS_IF([test "x$CROSSTARGET64" != "xno"], [AS_ECHO([" Using 64-bit cross compiler: $CROSSCC64"])])

1 0

Józef Kucia : vkd3d: Add support for optional instance extensions.
by Alexandre Julliard Aug. 20, 2018

Aug. 20, 2018

Module: vkd3d Branch: master Commit: d175afad7812a4aa6b84bb31bb0d732ceb293186 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d175afad7812a4aa6b84bb3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 17 09:57:00 2018 +0200 vkd3d: Add support for optional instance extensions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d.h | 11 +++++ libs/vkd3d/device.c | 116 ++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 109 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=d175afad7812a4aa6b8…

1 0

Józef Kucia : tests: Do not require libxcb and libx11 headers.
by Alexandre Julliard Aug. 20, 2018

Aug. 20, 2018

Module: vkd3d Branch: master Commit: 8b6158301146fa3f15a08cfff9c8f2e3be0ae0b3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8b6158301146fa3f15a08cf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 17 09:56:58 2018 +0200 tests: Do not require libxcb and libx11 headers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/vkd3d_api.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index e2d9d01..2c022ba 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -19,8 +19,6 @@ #define COBJMACROS #define INITGUID #define WIDL_C_INLINE_WRAPPERS -#define VK_USE_PLATFORM_XCB_KHR -#define VK_USE_PLATFORM_XLIB_KHR #include "vkd3d_test.h" #include <vkd3d.h> @@ -215,8 +213,8 @@ static void test_additional_instance_extensions(void) struct vulkan_extension extensions[] = { {VK_KHR_SURFACE_EXTENSION_NAME}, - {VK_KHR_XCB_SURFACE_EXTENSION_NAME}, - {VK_KHR_XLIB_SURFACE_EXTENSION_NAME}, + {"VK_KHR_xcb_surface"}, + {"VK_KHR_xlib_surface"}, }; const char *enabled_extensions[ARRAY_SIZE(extensions)]; @@ -249,12 +247,12 @@ static void test_additional_instance_extensions(void) if (!extensions[i].is_supported) continue; - if (!strcmp(extensions[i].name, VK_KHR_XCB_SURFACE_EXTENSION_NAME)) + if (!strcmp(extensions[i].name, "VK_KHR_xcb_surface")) { pfn = vkGetInstanceProcAddr(vk_instance, "vkCreateXcbSurfaceKHR"); ok(pfn, "Failed to get proc addr for vkCreateXcbSurfaceKHR.\n"); } - else if (!strcmp(extensions[i].name, VK_KHR_XLIB_SURFACE_EXTENSION_NAME)) + else if (!strcmp(extensions[i].name, "VK_KHR_xlib_surface")) { pfn = vkGetInstanceProcAddr(vk_instance, "vkCreateXlibSurfaceKHR"); ok(pfn, "Failed to get proc addr for vkCreateXlibSurfaceKHR.\n");

1 0

Józef Kucia : vkd3d-shader: Strip debug info after generating all code.
by Alexandre Julliard Aug. 20, 2018

Aug. 20, 2018

Module: vkd3d Branch: master Commit: 99a2daedb1e8dbce2d0aa83bf5e402abbfc68c9f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=99a2daedb1e8dbce2d0aa83… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 17 09:57:03 2018 +0200 vkd3d-shader: Strip debug info after generating all code. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d62d553..d40350f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6364,14 +6364,14 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - if (compiler->options & VKD3D_SHADER_STRIP_DEBUG) - vkd3d_spirv_stream_clear(&builder->debug_stream); - vkd3d_spirv_build_op_function_end(builder); if (compiler->output_setup_function_id) vkd3d_dxbc_compiler_emit_output_setup_function(compiler); + if (compiler->options & VKD3D_SHADER_STRIP_DEBUG) + vkd3d_spirv_stream_clear(&builder->debug_stream); + if (!vkd3d_spirv_compile_module(builder, spirv)) return VKD3D_ERROR;

1 0

Józef Kucia : tests: Fix mixed enums.
by Alexandre Julliard Aug. 20, 2018

Aug. 20, 2018

Module: vkd3d Branch: master Commit: 82e2e4d1a6dc5df736072a99d6d33b88d44fdcb6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=82e2e4d1a6dc5df736072a9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 17 09:57:02 2018 +0200 tests: Fix mixed enums. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7b00407..7d28661 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -16064,9 +16064,9 @@ static void test_resolve_query_data_in_different_command_list(void) ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); - ID3D12GraphicsCommandList_BeginQuery(command_list, query_heap, heap_desc.Type, 0); + ID3D12GraphicsCommandList_BeginQuery(command_list, query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0); ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); - ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, heap_desc.Type, 0); + ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0); transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); @@ -16076,7 +16076,7 @@ static void test_resolve_query_data_in_different_command_list(void) for (i = 0; i < readback_buffer_capacity / 2; ++i) { ID3D12GraphicsCommandList_ResolveQueryData(command_list, - query_heap, heap_desc.Type, 0, 1, readback_buffer, i * sizeof(UINT64)); + query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0, 1, readback_buffer, i * sizeof(UINT64)); } hr = ID3D12GraphicsCommandList_Close(command_list); ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr); @@ -16087,7 +16087,7 @@ static void test_resolve_query_data_in_different_command_list(void) for (; i < readback_buffer_capacity; ++i) { ID3D12GraphicsCommandList_ResolveQueryData(command_list, - query_heap, heap_desc.Type, 0, 1, readback_buffer, i * sizeof(UINT64)); + query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0, 1, readback_buffer, i * sizeof(UINT64)); } get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); @@ -16142,7 +16142,7 @@ static void test_resolve_query_data_in_reordered_command_list(void) /* Read query results in the second command list. */ ID3D12GraphicsCommandList_ResolveQueryData(command_lists[1], - query_heap, heap_desc.Type, 0, 1, readback_buffer, 0); + query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0, 1, readback_buffer, 0); hr = ID3D12GraphicsCommandList_Close(command_lists[1]); ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr); @@ -16153,9 +16153,9 @@ static void test_resolve_query_data_in_reordered_command_list(void) ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_lists[0], D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); ID3D12GraphicsCommandList_RSSetViewports(command_lists[0], 1, &context.viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_lists[0], 1, &context.scissor_rect); - ID3D12GraphicsCommandList_BeginQuery(command_lists[0], query_heap, heap_desc.Type, 0); + ID3D12GraphicsCommandList_BeginQuery(command_lists[0], query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0); ID3D12GraphicsCommandList_DrawInstanced(command_lists[0], 3, 1, 0, 0); - ID3D12GraphicsCommandList_EndQuery(command_lists[0], query_heap, heap_desc.Type, 0); + ID3D12GraphicsCommandList_EndQuery(command_lists[0], query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0); hr = ID3D12GraphicsCommandList_Close(command_lists[0]); ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);

1 0

Francois Gouget : testbot: Avoid map when when items must be handled in order.
by Alexandre Julliard Aug. 20, 2018

Aug. 20, 2018

Module: tools Branch: master Commit: b278c2a057677b8d280cf823d74622b8880658ba URL: https://source.winehq.org/git/tools.git/?a=commit;h=b278c2a057677b8d280cf82… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 20 09:05:22 2018 +0200 testbot: Avoid map when when items must be handled in order. Instead use 'statement($_) for (@List)' which is just as readable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PendingPatchSets.pm | 2 +- testbot/web/Munin.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index fc22a86..4ef7a66 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -113,7 +113,7 @@ sub SubmitSubset($$$) if (defined $Part and open(my $PartFile, "<" , "$DataDir/patches/" . $Part->Patch->Id)) { - map { print $CombinedFile $_; } <$PartFile>; + print $CombinedFile $_ for (<$PartFile>); close($PartFile); } } diff --git a/testbot/web/Munin.pl b/testbot/web/Munin.pl index 91155b7..840d912 100755 --- a/testbot/web/Munin.pl +++ b/testbot/web/Munin.pl @@ -474,7 +474,7 @@ sub GetOutput($) # Then print the corresponding data print "===== data =====\n"; - map { print $_ } @Data; + print $_ for (@Data); }

1 0