October 2017 - Wine-Commits

Józef Kucia : d3d11/tests: Add test for immediate constant UAV stores.
by Alexandre Julliard Oct. 16, 2017

Oct. 16, 2017

Module: wine Branch: master Commit: c534ba589eac2900cd645227b2afe5f83ff6d225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c534ba589eac2900cd645227b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Oct 14 17:36:27 2017 +0200 d3d11/tests: Add test for immediate constant UAV stores. 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 | 104 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f39e1ad..8df683e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -15883,6 +15883,109 @@ static void test_cs_uav_store(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_uav_store_immediate_constant(void) +{ + D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; + struct d3d11_test_context test_context; + ID3D11UnorderedAccessView *uav; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11ComputeShader *cs; + ID3D11Device *device; + ID3D11Buffer *buffer; + float float_data; + int int_data; + HRESULT hr; + + static const DWORD cs_store_int_code[] = + { +#if 0 + RWBuffer<int> u; + + [numthreads(1, 1, 1)] + void main() + { + u[0] = 42; + } +#endif + 0x43425844, 0x7246d785, 0x3f4ccbd6, 0x6a7cdbc0, 0xe2b58c72, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000064, 0x00050050, 0x00000019, 0x0100086a, + 0x0400089c, 0x0011e000, 0x00000000, 0x00003333, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, + 0x0d0000a4, 0x0011e0f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00004002, 0x0000002a, 0x0000002a, 0x0000002a, 0x0000002a, 0x0100003e, + }; + static const DWORD cs_store_float_code[] = + { +#if 0 + RWBuffer<float> u; + + [numthreads(1, 1, 1)] + void main() + { + u[0] = 1.0; + } +#endif + 0x43425844, 0x525eea68, 0xc4cd5716, 0xc588f9c4, 0x0da27c5a, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000064, 0x00050050, 0x00000019, 0x0100086a, + 0x0400089c, 0x0011e000, 0x00000000, 0x00005555, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, + 0x0d0000a4, 0x0011e0f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 0x0100003e, + }; + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + static const unsigned int zero[4] = {0}; + + if (!init_test_context(&test_context, &feature_level)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + buffer = create_buffer(device, D3D11_BIND_UNORDERED_ACCESS, 1024, NULL); + + uav_desc.Format = DXGI_FORMAT_R32_SINT; + uav_desc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER; + U(uav_desc).Buffer.FirstElement = 0; + U(uav_desc).Buffer.NumElements = 1; + U(uav_desc).Buffer.Flags = 0; + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + hr = ID3D11Device_CreateComputeShader(device, cs_store_int_code, sizeof(cs_store_int_code), NULL, &cs); + ok(SUCCEEDED(hr), "Failed to create compute shader, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, zero); + ID3D11DeviceContext_CSSetShader(context, cs, NULL, 0); + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, NULL); + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + get_buffer_readback(buffer, &rb); + int_data = get_readback_color(&rb, 0, 0); + ok(int_data == 42, "Got unexpected value %u.\n", int_data); + release_resource_readback(&rb); + + ID3D11ComputeShader_Release(cs); + ID3D11UnorderedAccessView_Release(uav); + uav_desc.Format = DXGI_FORMAT_R32_FLOAT; + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + hr = ID3D11Device_CreateComputeShader(device, cs_store_float_code, sizeof(cs_store_float_code), NULL, &cs); + ok(SUCCEEDED(hr), "Failed to create compute shader, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, zero); + ID3D11DeviceContext_CSSetShader(context, cs, NULL, 0); + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, NULL); + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + get_buffer_readback(buffer, &rb); + float_data = get_readback_float(&rb, 0, 0); + ok(float_data == 1.0f, "Got unexpected value %.8e.\n", float_data); + release_resource_readback(&rb); + + ID3D11Buffer_Release(buffer); + ID3D11ComputeShader_Release(cs); + ID3D11UnorderedAccessView_Release(uav); + release_test_context(&test_context); +} + static void test_ps_cs_uav_binding(void) { static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; @@ -21261,6 +21364,7 @@ START_TEST(d3d11) test_stencil_separate(); test_uav_load(); test_cs_uav_store(); + test_uav_store_immediate_constant(); test_ps_cs_uav_binding(); test_atomic_instructions(); test_sm4_ret_instruction();

1 0

Nikolay Sivov : gdiplus/metafile: Partially implement EmfPlusPath deserialization.
by Alexandre Julliard Oct. 16, 2017

Oct. 16, 2017

Module: wine Branch: master Commit: 2a2f61dfe96297e99400aea0688e347d4d89c1a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a2f61dfe96297e99400aea06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 16 10:12:23 2017 +0300 gdiplus/metafile: Partially implement EmfPlusPath deserialization. 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/gdiplus_private.h | 1 + dlls/gdiplus/metafile.c | 75 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index f659ccf..dc2f0892 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -394,6 +394,7 @@ struct emfplus_object { EmfPlusObjectType type; union { GpBrush *brush; + GpPath *path; GpImage *image; GpImageAttributes *image_attributes; void *object; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index fa4bafd..db74c9dc 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -388,6 +388,9 @@ static void metafile_free_object_table_entry(GpMetafile *metafile, BYTE id) case ObjectTypeBrush: GdipDeleteBrush(object->u.brush); break; + case ObjectTypePath: + GdipDeletePath(object->u.path); + break; case ObjectTypeImage: GdipDisposeImage(object->u.image); break; @@ -1572,6 +1575,75 @@ static GpStatus metafile_deserialize_image(const BYTE *record_data, UINT data_si return status; } +static GpStatus metafile_deserialize_path(const BYTE *record_data, UINT data_size, GpPath **path) +{ + EmfPlusPath *data = (EmfPlusPath *)record_data; + GpStatus status; + BYTE *types; + UINT size; + DWORD i; + + *path = NULL; + + if (data_size <= FIELD_OFFSET(EmfPlusPath, data)) + return InvalidParameter; + data_size -= FIELD_OFFSET(EmfPlusPath, data); + + if (data->PathPointFlags & 0x800) /* R */ + { + FIXME("RLE encoded path data is not supported.\n"); + return NotImplemented; + } + else + { + if (data->PathPointFlags & 0x4000) /* C */ + size = sizeof(EmfPlusPoint); + else + size = sizeof(EmfPlusPointF); + size += sizeof(BYTE); /* EmfPlusPathPointType */ + size *= data->PathPointCount; + } + + if (data_size < size) + return InvalidParameter; + + status = GdipCreatePath(FillModeAlternate, path); + if (status != Ok) + return status; + + (*path)->pathdata.Count = data->PathPointCount; + (*path)->pathdata.Points = GdipAlloc(data->PathPointCount * sizeof(*(*path)->pathdata.Points)); + (*path)->pathdata.Types = GdipAlloc(data->PathPointCount * sizeof(*(*path)->pathdata.Types)); + (*path)->datalen = (*path)->pathdata.Count; + + if (!(*path)->pathdata.Points || !(*path)->pathdata.Types) + { + GdipDeletePath(*path); + return OutOfMemory; + } + + if (data->PathPointFlags & 0x4000) /* C */ + { + EmfPlusPoint *points = (EmfPlusPoint *)data->data; + for (i = 0; i < data->PathPointCount; i++) + { + (*path)->pathdata.Points[i].X = points[i].X; + (*path)->pathdata.Points[i].Y = points[i].Y; + } + types = (BYTE *)(points + i); + } + else + { + EmfPlusPointF *points = (EmfPlusPointF *)data->data; + memcpy((*path)->pathdata.Points, points, sizeof(*points) * data->PathPointCount); + types = (BYTE *)(points + data->PathPointCount); + } + + memcpy((*path)->pathdata.Types, types, sizeof(*types) * data->PathPointCount); + + return Ok; +} + static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_size, GpBrush **brush) { static const UINT header_size = FIELD_OFFSET(EmfPlusBrush, BrushData); @@ -1614,6 +1686,9 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d case ObjectTypeBrush: status = metafile_deserialize_brush(record_data, data_size, (GpBrush **)&object); break; + case ObjectTypePath: + status = metafile_deserialize_path(record_data, data_size, (GpPath **)&object); + break; case ObjectTypeImage: status = metafile_deserialize_image(record_data, data_size, (GpImage **)&object); break;

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillPath.
by Alexandre Julliard Oct. 16, 2017

Oct. 16, 2017

Module: wine Branch: master Commit: 6cde9952f243f8df19dbe5051a43380120cb947c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cde9952f243f8df19dbe5051… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 16 10:12:24 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillPath. 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/metafile.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index db74c9dc..43d2d8c 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2233,6 +2233,39 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, points, 3, draw->SrcRect.X, draw->SrcRect.Y, draw->SrcRect.Width, draw->SrcRect.Height, draw->SrcUnit, real_metafile->objtable[draw->ImageAttributesID].u.image_attributes, NULL, NULL); } + case EmfPlusRecordTypeFillPath: + { + EmfPlusFillPath *fill = (EmfPlusFillPath *)header; + GpSolidFill *solidfill = NULL; + BYTE path = flags & 0xff; + GpBrush *brush; + + if (path >= EmfPlusObjectTableSize || real_metafile->objtable[path].type != ObjectTypePath) + return InvalidParameter; + + if (dataSize != sizeof(fill->data.BrushId)) + return InvalidParameter; + + if (flags & 0x8000) + { + stat = GdipCreateSolidFill(*(ARGB *)&fill->data.Color, (GpSolidFill **)&solidfill); + if (stat != Ok) + return stat; + brush = (GpBrush *)solidfill; + } + else + { + if (fill->data.BrushId >= EmfPlusObjectTableSize || + real_metafile->objtable[fill->data.BrushId].type != ObjectTypeBrush) + return InvalidParameter; + + brush = real_metafile->objtable[fill->data.BrushId].u.brush; + } + + stat = GdipFillPath(real_metafile->playback_graphics, brush, real_metafile->objtable[path].u.path); + GdipDeleteBrush((GpBrush *)solidfill); + return stat; + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

Martin Storsjo : api-ms-win-core-file-l1-2-2: Add dll.
by Alexandre Julliard Oct. 16, 2017

Oct. 16, 2017

Module: wine Branch: master Commit: 987c8ccfcbdf15bf08f692d221ff05fad5619326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=987c8ccfcbdf15bf08f692d22… Author: Martin Storsjo <martin(a)martin.st> Date: Sun Oct 15 22:08:44 2017 +0300 api-ms-win-core-file-l1-2-2: Add dll. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-file-l1-2-2/Makefile.in | 1 + .../api-ms-win-core-file-l1-2-2.spec | 10 ++++++++++ tools/make_specfiles | 1 + 5 files changed, 15 insertions(+) diff --git a/configure b/configure index 238d7ff..fa9b75e 100755 --- a/configure +++ b/configure @@ -910,6 +910,7 @@ enable_api_ms_win_core_fibers_l1_1_1 enable_api_ms_win_core_file_l1_1_0 enable_api_ms_win_core_file_l1_2_0 enable_api_ms_win_core_file_l1_2_1 +enable_api_ms_win_core_file_l1_2_2 enable_api_ms_win_core_file_l2_1_0 enable_api_ms_win_core_file_l2_1_1 enable_api_ms_win_core_file_l2_1_2 @@ -17998,6 +17999,7 @@ wine_fn_config_dll api-ms-win-core-fibers-l1-1-1 enable_api_ms_win_core_fibers_l wine_fn_config_dll api-ms-win-core-file-l1-1-0 enable_api_ms_win_core_file_l1_1_0 wine_fn_config_dll api-ms-win-core-file-l1-2-0 enable_api_ms_win_core_file_l1_2_0 wine_fn_config_dll api-ms-win-core-file-l1-2-1 enable_api_ms_win_core_file_l1_2_1 +wine_fn_config_dll api-ms-win-core-file-l1-2-2 enable_api_ms_win_core_file_l1_2_2 wine_fn_config_dll api-ms-win-core-file-l2-1-0 enable_api_ms_win_core_file_l2_1_0 wine_fn_config_dll api-ms-win-core-file-l2-1-1 enable_api_ms_win_core_file_l2_1_1 wine_fn_config_dll api-ms-win-core-file-l2-1-2 enable_api_ms_win_core_file_l2_1_2 diff --git a/configure.ac b/configure.ac index 76c7af5..9d33627 100644 --- a/configure.ac +++ b/configure.ac @@ -2762,6 +2762,7 @@ WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-file-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-1) +WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-2) WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1) WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-2) diff --git a/dlls/api-ms-win-core-file-l1-2-2/Makefile.in b/dlls/api-ms-win-core-file-l1-2-2/Makefile.in new file mode 100644 index 0000000..22cfea1 --- /dev/null +++ b/dlls/api-ms-win-core-file-l1-2-2/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-file-l1-2-2.dll diff --git a/dlls/api-ms-win-core-file-l1-2-2/api-ms-win-core-file-l1-2-2.spec b/dlls/api-ms-win-core-file-l1-2-2/api-ms-win-core-file-l1-2-2.spec new file mode 100644 index 0000000..bb58af1 --- /dev/null +++ b/dlls/api-ms-win-core-file-l1-2-2/api-ms-win-core-file-l1-2-2.spec @@ -0,0 +1,10 @@ +@ stdcall AreFileApisANSI() kernel32.AreFileApisANSI +@ stub FindFirstFileNameW +@ stub FindFirstStreamW +@ stub FindNextFileNameW +@ stub FindNextStreamW +@ stdcall GetTempFileNameA(str str long ptr) kernel32.GetTempFileNameA +@ stdcall GetTempPathA(long ptr) kernel32.GetTempPathA +@ stdcall GetVolumeInformationA(str ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationA +@ stdcall SetFileApisToANSI() kernel32.SetFileApisToANSI +@ stdcall SetFileApisToOEM() kernel32.SetFileApisToOEM diff --git a/tools/make_specfiles b/tools/make_specfiles index d5747c4..e1c7e1f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -209,6 +209,7 @@ my @dll_groups = "api-ms-win-core-file-l1-1-0", "api-ms-win-core-file-l1-2-1", "api-ms-win-core-file-l1-2-0", + "api-ms-win-core-file-l1-2-2", "api-ms-win-core-file-l2-1-0", "api-ms-win-core-file-l2-1-1", "api-ms-win-core-file-l2-1-2",

1 0

Francois Gouget : testbot: Add functions wrapping the VM::ChildPid field.
by Alexandre Julliard Oct. 16, 2017

Oct. 16, 2017

Module: tools Branch: master Commit: dfd3c1911f1befa6df35e6e327f936f1e07f4407 URL: http://source.winehq.org/git/tools.git/?a=commit;h=dfd3c1911f1befa6df35e6e3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 16 03:43:12 2017 +0200 testbot: Add functions wrapping the VM::ChildPid field. They allow checking if the VM status is compatible with having a child process, checking if the VM has a running process and killing the VM's child process if any. This makes the relevant code more readable and more maintanable by factorizing these operations. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 18 +++++++-------- testbot/lib/WineTestBot/VMs.pm | 51 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 10 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index ee496e2..b9c6ceb 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -71,8 +71,8 @@ sub FatalError(@) =item C<Cleanup()> -The Cleanup() function gets the tasks and VMs in a consistent state on the -Engine startup or cleanly stops the tasks and VMs on shutdown. +The Cleanup() function gets the Tasks and VMs in a consistent state on the +Engine startup or cleanly stops the Tasks and VMs on shutdown. It has to contend with three main scenarios: - The Engine being restarted. Any task started just before that is still running should still have its process and powered on VM and should be left @@ -81,15 +81,14 @@ It has to contend with three main scenarios: - The Engine startup after a reboot. All task processes will be dead and need to be requeued. But the VMs are likely to be hosted on a separate machine so it is quite possible that they will still be running. Hopefully any running - process matching a task's ChildPid will belong to another user so we don't + process matching a Task's ChildPid will belong to another user so we don't mistake that case for the previous one. -- A shutdown of the Engine and its tasks / VMs. In this case it's used to +- A shutdown of the Engine and its Tasks / VMs. In this case it's used to kill the running tasks and requeue them, and/or power off the VMs. In all cases we only trust that a VM status field is still valid if: -- It is 'running' and used by a task that is still running. -- It is 'reverting' or 'sleeping', is powered on and the revert process is - still running. +- It is 'running' and used by a Task that is still running. +- It can have a running process and that process is still running. - It is 'idle' and powered on. In all other cases the VM will be powered off and marked as such. @@ -187,15 +186,14 @@ sub Cleanup(;$$) { if ($KillVMs) { - kill("TERM", $VM->ChildPid) if (defined $VM->ChildPid); + $VM->KillChild(); } elsif ($VM->Status eq "idle") { # Assume these are still ready for use next; } - elsif (($VM->Status eq "reverting" or $VM->Status eq "sleeping") and - defined $VM->ChildPid and !kill(0, $VM->ChildPid)) + elsif ($VM->CanHaveChild() and $VM->HasRunningChild()) { # This VM is still being reverted. Let that process run its course. LogMsg "$VMKey is being reverted\n"; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index af052d9..629d408 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -226,6 +226,57 @@ sub Status($;$) return $NewStatus; } +=pod +=over 12 + +=item C<CanHaveChild()> + +Returns true if the VM status is compatible with ChildPid being set. + +=back +=cut + +sub CanHaveChild($) +{ + my ($self) = @_; + return ($self->Status =~ /^(?:reverting|sleeping)$/); +} + +=pod +=over 12 + +=item C<HasRunningChild()> + +Returns true if ChildPid is set and still identifies a running process. + +=back +=cut + +sub HasRunningChild($) +{ + my ($self) = @_; + return undef if (!$self->ChildPid); + return kill(0, $self->ChildPid); +} + +=pod +=over 12 + +=item C<KillChild()> + +If ChildPid is set, kills the corresponding process and unsets ChildPid. +It is up to the caller to save the updated VM object. + +=back +=cut + +sub KillChild($) +{ + my ($self) = @_; + kill("TERM", $self->ChildPid) if ($self->ChildPid); + $self->ChildPid(undef); +} + sub Validate($) { my ($self) = @_;

1 0

Francois Gouget : testbot: Better avoid race conditions in VMs::RunRevert( ).
by Alexandre Julliard Oct. 16, 2017

Oct. 16, 2017

Module: tools Branch: master Commit: fc96df4c171a80dc1df960c44d9c8734d987348c URL: http://source.winehq.org/git/tools.git/?a=commit;h=fc96df4c171a80dc1df960c4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 16 03:43:19 2017 +0200 testbot: Better avoid race conditions in VMs::RunRevert(). In order to use LibvirtTool for more than reverts, avoiding race conditions cannot rely on the special relationship between Status=reverting and ChildPid. So avoid the race conditions the right way in VMs::RunRevert(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 97 ++++++++++++++++++++++++++++++++---------- 1 file changed, 75 insertions(+), 22 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 629d408..86dee6c 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -142,6 +142,8 @@ are undergoing maintenance. =cut +use File::Basename; + use ObjectModel::BackEnd; use WineTestBot::Config; use WineTestBot::Engine::Notify; @@ -309,38 +311,89 @@ sub RunRevert($) { my ($self) = @_; - $self->Status("reverting"); - my ($ErrProperty, $ErrMessage) = $self->Save(); - return $ErrMessage if (defined $ErrMessage); - - # Make sure the child process does not inherit the database connection + my $Tool = "LibvirtTool.pl"; + my $Args = ["$BinDir/$Tool", "--log-only", "revert", $self->GetKey()]; + + # There are two $VM->ChildPid race conditions to avoid: + # - Between the child process and new calls to ScheduleJobs(). + # We cannot leave setting ChildPid to the child process because then it + # may still not be set by the time the next ScheduleJobs() call happens, + # which would result in a new child being started. + # Note that the status is not guaranteed to change in _RunVMTool() so it + # cannot be relied on to avoid this race. + # - Between RunRevert() and the exit of the child process. + # The child process may exit before RunRevert() gets around to setting + # ChildPid after the fork(). This would result in ChildPid remaining set + # indefinitely. + # So set ChildPid in the parent and synchronize with the child so it only + # starts once this is done. + + # Make sure the child process will use its own database connection $self->GetBackEnd()->Close(); - my $Pid = fork; + use Fcntl; + my ($fd_read, $fd_write); + pipe($fd_read, $fd_write); # For synchronization + + my $Pid = fork(); if (!defined $Pid) { + close($fd_read); + close($fd_write); return "Unable to start child process: $!"; } - elsif (!$Pid) + if ($Pid) { - $ENV{PATH} = "/usr/bin:/bin"; - delete $ENV{ENV}; - require WineTestBot::Log; - WineTestBot::Log::SetupRedirects(); - exec("$BinDir/LibvirtTool.pl", "--log-only", "revert", $self->GetKey()) or - WineTestBot::Log::LogMsg("Unable to exec LibvirtTool.pl: $!\n"); - exit(1); + close($fd_read); + + # Set the Status and ChildPid + $self->Status("reverting"); + $self->ChildPid($Pid); + my ($ErrProperty, $ErrMessage) = $self->Save(); + if ($ErrMessage) + { + close($fd_write); + return "Could not set the $Tool pid: $ErrMessage ($ErrProperty)"; + } + + # Let the child go + close($fd_write); + + return undef; } - # Note that if the child process completes quickly (typically due to some - # error), it may set ChildPid to undef before we get here. So we may end up - # with non-reverting VMs for which ChildPid is set. That's ok because - # ChildPid should be ignored anyway if Status is not 'reverting' or - # 'sleeping'. - $self->ChildPid($Pid); - $self->Save(); + # Wait for the parent to set $VM->ChildPid + close($fd_write); + sysread($fd_read, $fd_write, 1); + close($fd_read); + + # Get up-to-date information on the VM and verify the pid. If the parent + # failed to set the pid it may try to start another process at any time. + # So abort in order avoid interference. + require WineTestBot::VMs; + my $VM = WineTestBot::VMs::CreateVMs()->GetItem($self->GetKey()); + exit 1 if (($VM->ChildPid || 0) != $$); + $self->GetBackEnd()->Close(); + + require WineTestBot::Log; + WineTestBot::Log::LogMsg("Starting child: @$Args\n"); + + # Set up the file descriptors for the new process + WineTestBot::Log::SetupRedirects(); + + $ENV{PATH} = "/usr/bin:/bin"; + exec(@$Args) or + WineTestBot::Log::LogMsg("Unable to exec $Tool: $!\n"); - return undef; + # Reset the Status and ChildPid since the exec failed + $self->Status("offline"); + $self->ChildPid(undef); + my ($ErrProperty, $ErrMessage) = $self->Save(); + if ($ErrMessage) + { + WineTestBot::Log::LogMsg("Could not remove the $Tool pid: $ErrMessage ($ErrProperty)\n"); + } + exit 1; }

1 0

Alexandre Julliard : Wine release 2.19
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: website Branch: master Commit: 8003a9b7de67821a6ee69b86035734b5c353cb00 URL: http://source.winehq.org/git/website.git/?a=commit;h=8003a9b7de67821a6ee69b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 14 01:44:25 2017 +0200 Wine release 2.19 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017101401.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2017101401.xml b/news/en/2017101401.xml new file mode 100644 index 0000000..d88a985 --- /dev/null +++ b/news/en/2017101401.xml @@ -0,0 +1,17 @@ +<news> +<date>October 14, 2017</date> +<title>Wine 2.19 Released</title> +<body> + The Wine development release 2.19 is now available. + <a href="{$root}/announce/2.19">What's new</a> in this release: +<ul> + <li>Support for 32-bit float audio on Android.</li> + <li>Named pipes now fully handled by the Wine server.</li> + <li>Support for a new Microsoft root certificate.</li> + <li>More transform fixes in GdiPlus.</li> + <li>Some heap allocation optimizations.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.19.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alex Henrie : ucrtbase: Add __stdio_common_vsprintf_p.
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: master Commit: 8b6eada458a632e443d653da23f997840ffa5d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b6eada458a632e443d653da2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Oct 13 20:11:24 2017 +0200 ucrtbase: Add __stdio_common_vsprintf_p. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/wcs.c | 33 ++++++++++++++++------ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 98bb853..4921883 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -12,7 +12,7 @@ @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase.__stdio_common_vsnprintf_s @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) ucrtbase.__stdio_common_vsnwprintf_s @ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf -@ stub __stdio_common_vsprintf_p +@ cdecl __stdio_common_vsprintf_p(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf_p @ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf_s @ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index cd87f21..cffd5a9 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1447,11 +1447,8 @@ int CDECL MSVCRT_vswprintf_s_l(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElemen format, locale, args ); } -/********************************************************************* - * _vsprintf_p_l (MSVCRT.@) - */ -int CDECL MSVCRT_vsprintf_p_l(char *buffer, MSVCRT_size_t length, const char *format, - MSVCRT__locale_t locale, __ms_va_list args) +static int MSVCRT_vsprintf_p_l_opt(char *buffer, MSVCRT_size_t length, const char *format, + DWORD options, MSVCRT__locale_t locale, __ms_va_list args) { static const char nullbyte = '\0'; printf_arg args_ctx[MSVCRT__ARGMAX+1]; @@ -1466,11 +1463,11 @@ int CDECL MSVCRT_vsprintf_p_l(char *buffer, MSVCRT_size_t length, const char *fo *MSVCRT__errno() = MSVCRT_EINVAL; return ret; } else if(ret == 0) - ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, - arg_clbk_valist, NULL, &args); + ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, + MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, arg_clbk_valist, NULL, &args); else ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, - MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, + MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, arg_clbk_positional, args_ctx, NULL); puts_clbk_str_a(&puts_ctx, 1, &nullbyte); @@ -1478,6 +1475,15 @@ int CDECL MSVCRT_vsprintf_p_l(char *buffer, MSVCRT_size_t length, const char *fo } /********************************************************************* + * _vsprintf_p_l (MSVCRT.@) + */ +int CDECL MSVCRT_vsprintf_p_l(char *buffer, MSVCRT_size_t length, const char *format, + MSVCRT__locale_t locale, __ms_va_list args) +{ + return MSVCRT_vsprintf_p_l_opt(buffer, length, format, 0, locale, args); +} + +/********************************************************************* * _vsprintf_p (MSVCRT.@) */ int CDECL MSVCRT_vsprintf_p(char *buffer, MSVCRT_size_t length, @@ -1487,6 +1493,17 @@ int CDECL MSVCRT_vsprintf_p(char *buffer, MSVCRT_size_t length, } /********************************************************************* + * __stdio_common_vsprintf_p (UCRTBASE.@) + */ +int CDECL MSVCRT__stdio_common_vsprintf_p(unsigned __int64 options, char *buffer, MSVCRT_size_t length, + const char *format, MSVCRT__locale_t locale, __ms_va_list args) +{ + if (options & ~UCRTBASE_PRINTF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + return MSVCRT_vsprintf_p_l_opt(buffer, length, format, options & UCRTBASE_PRINTF_MASK, locale, args); +} + +/********************************************************************* * _sprintf_p_l (MSVCRT.@) */ int CDECL MSVCRT_sprintf_p_l(char *buffer, MSVCRT_size_t length, diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2b0f6fa..5495746 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -157,7 +157,7 @@ @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s @ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf -@ stub __stdio_common_vsprintf_p +@ cdecl __stdio_common_vsprintf_p(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_p @ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_s @ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf

1 0

Tag wine-2.19 : Alexandre Julliard : Release 2.19
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: refs/tags/wine-2.19 Tag: e935bd1ea20bf8819896c90666c41784a4b45188 URL: http://source.winehq.org/git/wine.git/?a=tag;h=e935bd1ea20bf8819896c90666c4… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 14 01:41:54 2017 +0200 Release 2.19

1 0

Nikolay Sivov : gdiplus/metafile: Support solid brushes in EmfPlusRecordTypeObject record playback.
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: master Commit: ce315b9f86b4acb0759e7b4bcf085059d5df3d83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce315b9f86b4acb0759e7b4bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 13 14:10:26 2017 +0300 gdiplus/metafile: Support solid brushes in EmfPlusRecordTypeObject record playback. 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/gdiplus_private.h | 1 + dlls/gdiplus/metafile.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index d6ccb95..95445e8 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -393,6 +393,7 @@ typedef enum EmfPlusObjectType struct emfplus_object { EmfPlusObjectType type; union { + GpBrush *brush; GpImageAttributes *image_attributes; void *object; } u; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 78ea854..de208a8 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -364,6 +364,9 @@ static void metafile_free_object_table_entry(GpMetafile *metafile, BYTE id) { case ObjectTypeInvalid: break; + case ObjectTypeBrush: + GdipDeleteBrush(object->u.brush); + break; case ObjectTypeImageAttributes: GdipDisposeImageAttributes(object->u.image_attributes); break; @@ -1443,6 +1446,33 @@ static void metafile_set_object_table_entry(GpMetafile *metafile, BYTE id, BYTE metafile->objtable[id].u.object = object; } +static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_size, GpBrush **brush) +{ + static const UINT header_size = FIELD_OFFSET(EmfPlusBrush, BrushData); + EmfPlusBrush *data = (EmfPlusBrush *)record_data; + GpStatus status; + + *brush = NULL; + + if (data_size < header_size) + return InvalidParameter; + + switch (data->Type) + { + case BrushTypeSolidColor: + if (data_size != header_size + sizeof(EmfPlusSolidBrushData)) + return InvalidParameter; + + status = GdipCreateSolidFill(*(ARGB *)&data->BrushData.solid.SolidColor, (GpSolidFill **)brush); + break; + default: + FIXME("brush type %u is not supported.\n", data->Type); + return NotImplemented; + } + + return status; +} + static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT data_size, const BYTE *record_data) { BYTE type = (flags >> 8) & 0xff; @@ -1455,6 +1485,9 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d switch (type) { + case ObjectTypeBrush: + status = metafile_deserialize_brush(record_data, data_size, (GpBrush **)&object); + break; case ObjectTypeImageAttributes: { EmfPlusImageAttributes *data = (EmfPlusImageAttributes *)record_data;

1 0