wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Daniel Lehman : msvcrt: Don't read past end of string in _strncoll/ _wcsncoll.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: wine Branch: master Commit: 368e9f39b4151a1094f62defeb308374061e137b URL: https://source.winehq.org/git/wine.git/?a=commit;h=368e9f39b4151a1094f62def… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Aug 17 18:51:00 2018 +0200 msvcrt: Don't read past end of string in _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/string.c | 4 +++- dlls/msvcrt/wcs.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index c8cd390..37bc224 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -666,7 +666,9 @@ int CDECL MSVCRT__strncoll_l( const char* str1, const char* str2, MSVCRT_size_t if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) return strncmp(str1, str2, count); - return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, count, str2, count)-CSTR_EQUAL; + return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, + 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 ed73fc6..3b22f62 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -335,7 +335,9 @@ int CDECL MSVCRT__wcsncoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* s if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) return strncmpW(str1, str2, count); - return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, count, str2, count)-CSTR_EQUAL; + return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, + str1, MSVCRT_wcsnlen(str1, count), + str2, MSVCRT_wcsnlen(str2, count))-CSTR_EQUAL; } /*********************************************************************

1 0

Zebediah Figura : hidclass.sys: Update the interface state when a device is added or removed.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: wine Branch: master Commit: 91ac8eb00ab85bc5d7bfaae1a32c9a8cc08c8a19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91ac8eb00ab85bc5d7bfaae1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 16 18:37:42 2018 -0500 hidclass.sys: Update the interface state when a device is added or removed. 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/hidclass.sys/device.c | 3 +++ dlls/hidclass.sys/pnp.c | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index a5cbee9..3364eb3 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -32,6 +32,7 @@ #include "wine/debug.h" #include "ddk/hidsdi.h" #include "ddk/hidtypes.h" +#include "ddk/wdm.h" #include "initguid.h" #include "devguid.h" @@ -166,6 +167,8 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device TRACE("Delete link %s\n", debugstr_w(ext->link_name)); RtlInitUnicodeString(&linkW, ext->link_name); + IoSetDeviceInterfaceState(&linkW, FALSE); + status = IoDeleteSymbolicLink(&linkW); if (status != STATUS_SUCCESS) ERR("Delete Symbolic Link failed (%x)\n",status); diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 6ee89c1..34bd944 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -23,6 +23,7 @@ #include <stdarg.h> #include "hid.h" #include "ddk/hidtypes.h" +#include "ddk/wdm.h" #include "regstr.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -282,6 +283,17 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) } break; } + case IRP_MN_START_DEVICE: + { + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + UNICODE_STRING linkU; + + rc = minidriver->PNPDispatch(device, irp); + + RtlInitUnicodeString(&linkU, ext->link_name); + IoSetDeviceInterfaceState(&linkU, TRUE); + return rc; + } case IRP_MN_REMOVE_DEVICE: { return PNP_RemoveDevice(minidriver, device, irp);

1 0

Zebediah Figura : xinput: Use DIGCF_PRESENT.
by Alexandre Julliard 20 Aug '18

20 Aug '18

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

Zebediah Figura : hid/tests: Use DIGCF_PRESENT.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: wine Branch: master Commit: 4526c5923cc55a7de0a6d803631898d63da325c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4526c5923cc55a7de0a6d803… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 16 18:37:40 2018 -0500 hid/tests: 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/hid/tests/device.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index ce9b3a5..f20677f 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -66,7 +66,7 @@ static void run_for_each_device(device_test *test) data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) + detail_size); data->cbSize = sizeof(*data); - info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE); + info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); while (SetupDiEnumDeviceInterfaces(info_set, NULL, &hid_guid, index, &interface_data)) { index ++; @@ -74,11 +74,13 @@ static void run_for_each_device(device_test *test) if (SetupDiGetDeviceInterfaceDetailW(info_set, &interface_data, data, sizeof(*data) + detail_size, NULL, NULL)) { HANDLE file = CreateFileW(data->DevicePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); - if (file == INVALID_HANDLE_VALUE) + if (file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_ACCESS_DENIED) { - trace("Failed to access device %s, likely not plugged in or access is denied.\n", wine_dbgstr_w(data->DevicePath)); + trace("Not enough permissions to read device %s.\n", wine_dbgstr_w(data->DevicePath)); continue; } + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", + wine_dbgstr_w(data->DevicePath), GetLastError()); test(file); @@ -108,7 +110,7 @@ static HANDLE get_device(USHORT page, USHORT usages[], UINT usage_count, DWORD a data = HeapAlloc(GetProcessHeap(), 0 , sizeof(*data) + detail_size); data->cbSize = sizeof(*data); - info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE); + info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); while (SetupDiEnumDeviceInterfaces(info_set, NULL, &hid_guid, index, &interface_data)) { index ++; @@ -118,11 +120,13 @@ static HANDLE get_device(USHORT page, USHORT usages[], UINT usage_count, DWORD a PHIDP_PREPARSED_DATA ppd; HIDP_CAPS Caps; HANDLE file = CreateFileW(data->DevicePath, access, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 0); - if (file == INVALID_HANDLE_VALUE) + if (file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_ACCESS_DENIED) { - trace("Failed to access device %s, likely not plugged in or access is denied.\n", wine_dbgstr_w(data->DevicePath)); + trace("Not enough permissions to read device %s.\n", wine_dbgstr_w(data->DevicePath)); continue; } + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + rc = HidD_GetPreparsedData(file, &ppd); ok(rc, "Failed to get preparsed data(0x%x)\n", GetLastError()); status = HidP_GetCaps(ppd, &Caps);

1 0

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

20 Aug '18

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 20 Aug '18

20 Aug '18

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

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

20 Aug '18

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 20 Aug '18

20 Aug '18

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 : build: Add a line about demos to the configure summary.
by Alexandre Julliard 20 Aug '18

20 Aug '18

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

Francois Gouget : testbot/build: Allow both commas and colons in the target lists.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: tools Branch: master Commit: d3d012ea7be2743c5073a0c3d5e8fa562c32ebda URL: https://source.winehq.org/git/tools.git/?a=commit;h=d3d012ea7be2743c5073a0c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 20 09:08:10 2018 +0200 testbot/build: Allow both commas and colons in the target lists. This paves the way to a future switch to colons. It is only needed for Build.pl and WineTest.pl since the TestBot does not pass a target list to the Reconfig scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 2 +- testbot/bin/build/WineTest.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 920fc82..b729d95 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -250,7 +250,7 @@ if (!defined $Usage) } $TargetList = join(",", keys %AllTargets) if (!defined $TargetList); - foreach my $Target (split /,/, $TargetList) + foreach my $Target (split /[,:]/, $TargetList) { $Target = "exe$1" if ($Target =~ /^(32|64)$/); if (!$AllTargets{$Target}) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 1010619..3310b4c 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -282,7 +282,7 @@ if (!defined $Usage) { if (defined $TargetList) { - foreach my $Target (split /,/, $TargetList) + foreach my $Target (split /[,:]/, $TargetList) { if (!$AllTargets{$Target}) {

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2018