February 2018 - Wine-commits

Nikolay Sivov : gdiplus/tests: Add some invalid arguments tests for GdipLoadImageFromStream().
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: wine Branch: master Commit: 279cad235242dd0d34aa1993dfd8c24d479a3130 URL: https://source.winehq.org/git/wine.git/?a=commit;h=279cad235242dd0d34aa1993… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 28 09:34:35 2018 +0300 gdiplus/tests: Add some invalid arguments tests for GdipLoadImageFromStream(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 28f0fce..34222e7 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5161,6 +5161,37 @@ static void test_png_color_formats(void) } } +static void test_GdipLoadImageFromStream(void) +{ + IStream *stream; + GpStatus status; + GpImage *image; + HGLOBAL hglob; + BYTE *data; + HRESULT hr; + + status = GdipLoadImageFromStream(NULL, NULL); + ok(status == InvalidParameter, "Unexected return value %d.\n", status); + + image = (void *)0xdeadbeef; + status = GdipLoadImageFromStream(NULL, &image); + ok(status == InvalidParameter, "Unexected return value %d.\n", status); + ok(image == (void *)0xdeadbeef, "Unexpected image pointer.\n"); + + hglob = GlobalAlloc(0, sizeof(pngimage)); + data = GlobalLock (hglob); + memcpy(data, pngimage, sizeof(pngimage)); + GlobalUnlock(hglob); + + hr = CreateStreamOnHGlobal(hglob, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream.\n"); + + status = GdipLoadImageFromStream(stream, NULL); + ok(status == InvalidParameter, "Unexpected return value %d.\n", status); + + IStream_Release(stream); +} + START_TEST(image) { HMODULE mod = GetModuleHandleA("gdiplus.dll"); @@ -5234,6 +5265,7 @@ START_TEST(image) test_getadjustedpalette(); test_histogram(); test_imageabort(); + test_GdipLoadImageFromStream(); GdiplusShutdown(gdiplusToken); }

1 0

Józef Kucia : wined3d: Do not call context_validate_onscreen_formats() in context_apply_blit_state().
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: wine Branch: master Commit: cae8ebab91798856d3f12caf5f8b4d9035693ce8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cae8ebab91798856d3f12caf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 28 12:12:34 2018 +0100 wined3d: Do not call context_validate_onscreen_formats() in context_apply_blit_state(). It does nothing when depth_stencil is NULL. 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> --- dlls/wined3d/context.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 32126b7..4282cfb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2956,8 +2956,6 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - context_validate_onscreen_formats(context, NULL); - if (context->render_offscreen) { wined3d_texture_load(rt, context, FALSE);

1 0

Józef Kucia : wined3d: Use wined3d_bit_scan() in find_draw_buffers_mask().
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: wine Branch: master Commit: e27141e01545d55c4b0b8584a859f506aaa7ae43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e27141e01545d55c4b0b8584… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 28 12:12:37 2018 +0100 wined3d: Use wined3d_bit_scan() in find_draw_buffers_mask(). 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> --- dlls/wined3d/context.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4282cfb..975a79c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3128,7 +3128,7 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const { struct wined3d_rendertarget_view * const *rts = state->fb->render_targets; struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; - DWORD rt_mask, rt_mask_bits; + DWORD rt_mask, mask; unsigned int i; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) @@ -3138,15 +3138,13 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const rt_mask = ps ? ps->reg_maps.rt_mask : 1; rt_mask &= context->d3d_info->valid_rt_mask; - rt_mask_bits = rt_mask; - i = 0; - while (rt_mask_bits) + + mask = rt_mask; + while (mask) { - rt_mask_bits &= ~(1u << i); + i = wined3d_bit_scan(&mask); if (!rts[i] || rts[i]->format->id == WINED3DFMT_NULL) rt_mask &= ~(1u << i); - - i++; } return rt_mask;

1 0

Alexandre Julliard : ntdll: Allow loading 32-bit IL-only binaries on 64-bit.
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: wine Branch: master Commit: 97b0907439183cb86e6c05a4d8c9bf14d73805c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97b0907439183cb86e6c05a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 09:57:59 2018 +0100 ntdll: Allow loading 32-bit IL-only binaries on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6884e8d..46a7d22 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1809,18 +1809,27 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len ) /* On WoW64 setups, an image mapping can also be created for the other 32/64 CPU */ /* but it cannot necessarily be loaded as a dll, so we need some additional checks */ -static BOOL is_valid_binary( const pe_image_info_t *info ) +static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) { #ifdef __i386__ return info->machine == IMAGE_FILE_MACHINE_I386; -#elif defined(__x86_64__) - return info->machine == IMAGE_FILE_MACHINE_AMD64 || !info->contains_code; #elif defined(__arm__) return info->machine == IMAGE_FILE_MACHINE_ARM || info->machine == IMAGE_FILE_MACHINE_THUMB || info->machine == IMAGE_FILE_MACHINE_ARMNT; -#elif defined(__aarch64__) - return info->machine == IMAGE_FILE_MACHINE_ARM64 || !info->contains_code; +#elif defined(__x86_64__) || defined(__aarch64__) /* support 32-bit IL-only images on 64-bit */ + const IMAGE_COR20_HEADER *cor_header; + DWORD size; + +#ifdef __x86_64__ + if (info->machine == IMAGE_FILE_MACHINE_AMD64) return TRUE; +#else + if (info->machine == IMAGE_FILE_MACHINE_ARM64) return TRUE; +#endif + if (!info->contains_code) return TRUE; + cor_header = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR, &size ); + if (cor_header && (cor_header->Flags & COMIMAGE_FLAGS_ILONLY)) return TRUE; + return FALSE; #else return FALSE; /* no wow64 support on other platforms */ #endif @@ -1855,7 +1864,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, NtClose( mapping ); if ((status == STATUS_SUCCESS || status == STATUS_IMAGE_NOT_AT_BASE) && - !is_valid_binary( &image_info )) + !is_valid_binary( module, &image_info )) { NtUnmapViewOfSection( NtCurrentProcess(), module ); return STATUS_INVALID_IMAGE_FORMAT;

1 0

Alexandre Julliard : ntdll: Check file identity in addition to file name to find a loaded module.
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: wine Branch: master Commit: 1cee60d06823a6224646b425243ed0617c4d1c0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cee60d06823a6224646b425… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 10:11:55 2018 +0100 ntdll: Check file identity in addition to file name to find a loaded module. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 9 ----- dlls/ntdll/loader.c | 91 ++++++++++++++++++++++++++++++++------------ 2 files changed, 66 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1cee60d06823a6224646…

1 0

Józef Kucia : d3d11/tests: Add test for unbound multisample textures.
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: wine Branch: master Commit: d75ec29384c0d992e64955be9e9ccf8212e744c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d75ec29384c0d992e64955be… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 28 12:12:38 2018 +0100 d3d11/tests: Add test for unbound multisample textures. 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> --- dlls/d3d11/tests/d3d11.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5a36bc2..713a030 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -25020,6 +25020,93 @@ done: release_test_context(&test_context); } +static void test_unbound_multisample_texture(void) +{ + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + ID3D11PixelShader *ps; + struct uvec4 cb_data; + ID3D11Device *device; + ID3D11Buffer *cb; + unsigned int i; + HRESULT hr; + + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD ps_code[] = + { +#if 0 + Texture2DMS<float4, 4> t; + + uint sample_index; + + float4 main(float4 position : SV_Position) : SV_Target + { + float3 p; + t.GetDimensions(p.x, p.y, p.z); + p *= float3(position.x / 640.0f, position.y / 480.0f, 0.0f); + /* sample index must be a literal */ + switch (sample_index) + { + case 1: return t.Load(int2(p.xy), 1); + case 2: return t.Load(int2(p.xy), 2); + case 3: return t.Load(int2(p.xy), 3); + default: return t.Load(int2(p.xy), 0); + } + } +#endif + 0x43425844, 0x03d62416, 0x1914ee8b, 0xccd08d68, 0x27f42136, 0x00000001, 0x000002f8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x0000025c, 0x00000040, + 0x00000097, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04042058, 0x00107000, 0x00000000, + 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000002, 0x0700003d, 0x001000f2, 0x00000000, 0x00004001, 0x00000000, 0x00107e46, + 0x00000000, 0x07000038, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00101046, 0x00000000, + 0x0a000038, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, + 0x00000000, 0x00000000, 0x0400004c, 0x0020800a, 0x00000000, 0x00000000, 0x03000006, 0x00004001, + 0x00000001, 0x0500001b, 0x00100032, 0x00000001, 0x00100046, 0x00000000, 0x08000036, 0x001000c2, + 0x00000001, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0900002e, 0x001020f2, + 0x00000000, 0x00100e46, 0x00000001, 0x00107e46, 0x00000000, 0x00004001, 0x00000001, 0x0100003e, + 0x03000006, 0x00004001, 0x00000002, 0x0500001b, 0x00100032, 0x00000001, 0x00100046, 0x00000000, + 0x08000036, 0x001000c2, 0x00000001, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x0900002e, 0x001020f2, 0x00000000, 0x00100e46, 0x00000001, 0x00107e46, 0x00000000, 0x00004001, + 0x00000002, 0x0100003e, 0x03000006, 0x00004001, 0x00000003, 0x0500001b, 0x00100032, 0x00000001, + 0x00100046, 0x00000000, 0x08000036, 0x001000c2, 0x00000001, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x0900002e, 0x001020f2, 0x00000000, 0x00100e46, 0x00000001, 0x00107e46, + 0x00000000, 0x00004001, 0x00000003, 0x0100003e, 0x0100000a, 0x0500001b, 0x00100032, 0x00000000, + 0x00100046, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x0900002e, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, + 0x00000000, 0x00004001, 0x00000000, 0x0100003e, 0x01000017, 0x0100003e, + }; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + memset(&cb_data, 0, sizeof(cb_data)); + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(cb_data), &cb_data); + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + + for (i = 0; i < 4; ++i) + { + cb_data.x = i; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &cb_data, 0, 0); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0x00000000, 1); + } + + ID3D11Buffer_Release(cb); + ID3D11PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -25149,4 +25236,5 @@ START_TEST(d3d11) test_combined_clip_and_cull_distances(); test_generate_mips(); test_alpha_to_coverage(); + test_unbound_multisample_texture(); }

1 0

Alexandre Julliard : ntdll: Add a helper function to open a dll file.
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: wine Branch: master Commit: 6d6669fb2d208d7ce7fe2365fada1bc1bb96a3fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d6669fb2d208d7ce7fe2365… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 09:59:02 2018 +0100 ntdll: Add a helper function to open a dll file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d707397..6884e8d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2157,6 +2157,31 @@ done: /*********************************************************************** + * open_dll_file + * + * Open a file for a new dll. Helper for find_dll_file. + */ +static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm ) +{ + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + HANDLE handle; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = nt_name; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + if (NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_DELETE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE )) + return 0; + + return handle; +} + + +/*********************************************************************** * find_dll_file * * Find the file (or already loaded module) for a given dll name. @@ -2164,8 +2189,6 @@ done: static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, WCHAR *filename, ULONG *size, WINE_MODREF **pwm, HANDLE *handle ) { - OBJECT_ATTRIBUTES attr; - IO_STATUS_BLOCK io; UNICODE_STRING nt_name; WCHAR *file_part, *ext, *dllname; ULONG len; @@ -2220,13 +2243,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, RtlFreeHeap( GetProcessHeap(), 0, dllname ); return STATUS_NO_MEMORY; } - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.Attributes = OBJ_CASE_INSENSITIVE; - attr.ObjectName = &nt_name; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - if (NtOpenFile( handle, GENERIC_READ|SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; + *handle = open_dll_file( &nt_name, pwm ); goto found; } @@ -2254,15 +2271,8 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, if (len >= *size) goto overflow; memcpy( filename, nt_name.Buffer + 4, len + sizeof(WCHAR) ); if (!(*pwm = find_fullname_module( filename )) && handle) - { - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.Attributes = OBJ_CASE_INSENSITIVE; - attr.ObjectName = &nt_name; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - if (NtOpenFile( handle, GENERIC_READ|SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; - } + *handle = open_dll_file( &nt_name, pwm ); + found: RtlFreeUnicodeString( &nt_name ); RtlFreeHeap( GetProcessHeap(), 0, dllname );

1 0

Zebediah Figura : winetest/dissect: Stop complaining if a test file doesn' t match the current test.
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: tools Branch: master Commit: 53356b3d3fa5d2cc648e50a8abd7826d1ea1cc4c URL: https://source.winehq.org/git/tools.git/?a=commit;h=53356b3d3fa5d2cc648e50a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 27 09:56:12 2018 -0600 winetest/dissect: Stop complaining if a test file doesn't match the current test. Now that we have support for custom dlls in e.g. dlls/msi/tests/custom.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 -- 1 file changed, 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 9635f0a..7416317 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -624,7 +624,6 @@ while ($line = <IN>) { add_test_line("failed", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); - check_unit($l_unit, "failure"); $failures++; } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test marked todo: .*)$/ or @@ -635,7 +634,6 @@ while ($line = <IN>) { add_test_line("todo", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); - check_unit($l_unit, "todo"); $todo++; } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Tests skipped: .*)$/ or

1 0

Francois Gouget : testbot/Janitor: Remove a spurious leading 0 in a log message.
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: tools Branch: master Commit: 00112a1ed9e0a692b04fd0fa59b673b8a9212e36 URL: https://source.winehq.org/git/tools.git/?a=commit;h=00112a1ed9e0a692b04fd0f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 28 01:40:30 2018 +0100 testbot/Janitor: Remove a spurious leading 0 in a log message. The leading 0 is a convention only used to communicate with the Engine. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 382408d..d8a9650 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -258,7 +258,7 @@ if (opendir(my $dh, "$DataDir/staging")) } else { - LogMsg "0Unable to open '$DataDir/staging': $!"; + LogMsg "Unable to open '$DataDir/staging': $!"; } # Delete obsolete record groups

1 0

Francois Gouget : testbot: Check the current snapshot in LibvirtTool checkidle.
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: tools Branch: master Commit: 98ec6ba6d7aa219201a2defda745af4febfbeef0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=98ec6ba6d7aa219201a2def… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 28 01:54:29 2018 +0100 testbot: Check the current snapshot in LibvirtTool checkidle. If the snapshot does not match then the current VM instance is not actually using the hypervisor domain so mark it off. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 7 +++++-- testbot/lib/WineTestBot/VMs.pm | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 670c553..12eaa66 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -320,9 +320,12 @@ sub CheckIdle() my ($ErrMessage, $SnapshotName) = $VM->GetDomain()->GetSnapshotName(); FatalError("$ErrMessage\n") if (defined $ErrMessage); - return PowerOff() if ($SnapshotName ne $VM->IdleSnapshot); - return ChangeStatus("dirty", "idle", "done"); + # If the snapshot does not match then the virtual machine may be used by + # another VM instance. So don't touch it. All that counts is that this + # VM instance is not running. + my $NewStatus = ($SnapshotName eq $VM->IdleSnapshot) ? "idle" : "off"; + return ChangeStatus("dirty", $NewStatus, "done"); } sub Revert() diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index d893e49..f098639 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -433,9 +433,9 @@ sub _RunVMTool($$$) =item C<RunCheckIdle()> -If the virtual machine state matches that of this VM instance, sets its status -to idle. If not the VM is simply marked as off. While this is happening the -VM status is set to dirty so the job scheduler does not try to use it. +If the hypervisor domain state matches that of this VM instance, sets its +status to idle. If not the VM is simply marked as off. While this is happening +the VM status is set to dirty so the job scheduler does not try to use it. This operation can take a long time so it is performed in a separate process.

1 0