February 2018 - Wine-commits

Francois Gouget : testbot: Add some traces to help diagnose scheduler issues.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: tools Branch: master Commit: b8967f23d80d84311decba77b3febc76385566b9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b8967f23d80d84311decba7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 19 04:25:14 2018 +0100 testbot: Add some traces to help diagnose scheduler issues. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 59 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 0362221..9a0f8bc 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -1012,6 +1012,63 @@ sub _SacrificeVM($$$) return 1; } +sub _DumpHostCounters($$) +{ + my ($Sched, $VM) = @_; + my $Host = _GetSchedHost($Sched, $VM); + return if ($Host->{dumpedcounters}); + + my $Counters = ""; + if ($Host->{active}) + { + $Counters .= " active=$Host->{active}/$Host->{MaxActiveVMs}"; + } + if ($Host->{idle}) + { + $Counters .= " idle=$Host->{idle}". ($Host->{queued} ? "" : "/$Host->{MaxVMsWhenIdle}"); + } + if ($Host->{reverting}) + { + $Counters .= " reverting=$Host->{reverting}/". _GetMaxReverts($Host); + } + for my $Counter ("sleeping", "running", "dirty", "queued") + { + $Counters .= " $Counter=$Host->{$Counter}" if ($Host->{$Counter}); + } + my $HostKey = $VM->GetHost(); + my $PrettyHost = ($PrettyHostNames ? $PrettyHostNames->{$HostKey} : "") || + $HostKey; + require WineTestBot::Log; + WineTestBot::Log::LogMsg("$PrettyHost:$Counters\n") if ($Counters); + + $Host->{dumpedcounters} = 1; +} + +sub _DumpHostVMs($$$$) +{ + my ($Sched, $VM, $SortedNeededVMs, $NeededVMs) = @_; + my $Host = _GetSchedHost($Sched, $VM); + return if ($Host->{dumpedvms}); + + _DumpHostCounters($Sched, $VM); + + my @VMInfo; + my $HostKey = $VM->GetHost(); + foreach my $VMKey (@$SortedNeededVMs) + { + $VM = $Sched->{VMs}->GetItem($VMKey); + next if ($VM->GetHost() ne $HostKey); + + push @VMInfo, join(":", "$VMKey(". $VM->Status .")", $NeededVMs->{$VMKey}->[0], $NeededVMs->{$VMKey}->[1], $NeededVMs->{$VMKey}->[2]); + } + my $PrettyHost = ($PrettyHostNames ? $PrettyHostNames->{$HostKey} : "") || + $HostKey; + require WineTestBot::Log; + WineTestBot::Log::LogMsg("$PrettyHost: @VMInfo\n"); + + $Host->{dumpedvms} = 1; +} + sub _RevertVMs($$) { my ($Sched, $NeededVMs) = @_; @@ -1027,6 +1084,7 @@ sub _RevertVMs($$) # Check if the host has reached its reverting VMs limit my $Host = _GetSchedHost($Sched, $VM); next if ($Host->{reverting} >= _GetMaxReverts($Host)); + _DumpHostCounters($Sched, $VM); # Skip this VM if the previous step's tasks are not about to run yet next if (_HasMissingDependencies($Sched, $NeededVMs, $VMKey)); @@ -1071,6 +1129,7 @@ sub _RevertVMs($$) $NeedsSacrifice = ($FutureActive > $Host->{MaxActiveVMs}); } + _DumpHostVMs($Sched, $VM, \@SortedNeededVMs, $NeededVMs); if ($NeedsSacrifice) { # Find an active VM to sacrifice so we can revert this VM in the next

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard 17 Feb '18

17 Feb '18

Module: bugzilla Branch: master Commit: 68fa9518d63526c152bc72a6c3365e32dfdc866d URL: https://source.winehq.org/git/bugzilla.git/?a=commit;h=68fa9518d63526c152bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 16:00:54 2018 +0100 Merge branch 'upstream'. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> ---

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.13.
by Alexandre Julliard 17 Feb '18

17 Feb '18

Module: bugzilla Branch: master Commit: e1a085af1689c07fb06f145d16d5624222691a72 URL: https://source.winehq.org/git/bugzilla.git/?a=commit;h=e1a085af1689c07fb06f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 16:00:03 2018 +0100 Import of upstream bugzilla release 4.4.13. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Bugzilla/CGI.pm | 64 +++++++++++++++++++++++ Bugzilla/Constants.pm | 2 +- Bugzilla/DB/Sqlite.pm | 1 + attachment.cgi | 1 + docs/bugzilla.ent.tmpl | 6 +-- taskgraph.json | 42 ++++++++------- template/en/default/pages/release-notes.html.tmpl | 14 +++++ 7 files changed, 106 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=e1a085af1689c07f…

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.13.
by Alexandre Julliard 17 Feb '18

17 Feb '18

Module: bugzilla Branch: upstream Commit: e1a085af1689c07fb06f145d16d5624222691a72 URL: https://source.winehq.org/git/bugzilla.git/?a=commit;h=e1a085af1689c07fb06f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 16:00:03 2018 +0100 Import of upstream bugzilla release 4.4.13. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Bugzilla/CGI.pm | 64 +++++++++++++++++++++++ Bugzilla/Constants.pm | 2 +- Bugzilla/DB/Sqlite.pm | 1 + attachment.cgi | 1 + docs/bugzilla.ent.tmpl | 6 +-- taskgraph.json | 42 ++++++++------- template/en/default/pages/release-notes.html.tmpl | 14 +++++ 7 files changed, 106 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=e1a085af1689c07f…

1 0

Alexandre Julliard : Wine release 3.2
by Alexandre Julliard 16 Feb '18

16 Feb '18

Module: website Branch: master Commit: 924b7c93d971d4de6bc4eeb1ec796e4ea0064ce9 URL: https://source.winehq.org/git/website.git/?a=commit;h=924b7c93d971d4de6bc4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 16 20:41:49 2018 +0100 Wine release 3.2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018021601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2018021601.xml b/news/en/2018021601.xml new file mode 100644 index 0000000..120bf20 --- /dev/null +++ b/news/en/2018021601.xml @@ -0,0 +1,17 @@ +<news> +<date>February 16, 2018</date> +<title>Wine 3.2 Released</title> +<body> + The Wine development release 3.2 is now available. + <a href="{$root}/announce/3.2">What's new</a> in this release: +<ul> + <li>Separate implementation of USER controls for ComCtl32 v6.</li> + <li>Multisample texture support in Direct3D.</li> + <li>Support for HID gamepads.</li> + <li>More event support in MSHTML.</li> + <li>Obsolete DOS code removed.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.2.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 : setupapi/tests: Drop install test workarounds for Windows <= 2000.
by Alexandre Julliard 16 Feb '18

16 Feb '18

Module: wine Branch: master Commit: 02acc6514a376ef6ffefa6a132066c4fb8d8c40c URL: https://source.winehq.org/git/wine.git/?a=commit;h=02acc6514a376ef6ffefa6a1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Feb 16 08:41:15 2018 -0700 setupapi/tests: Drop install test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/Makefile.in | 2 +- dlls/setupapi/tests/install.c | 182 ++++++++++------------------------------ 2 files changed, 46 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02acc6514a376ef6ffef…

1 0

Alexandre Julliard : Release 3.2.
by Alexandre Julliard 16 Feb '18

16 Feb '18

Module: wine Branch: master Commit: 2936f3f9bb9dc01c595498a821d6adb6775b62cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2936f3f9bb9dc01c595498a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 16 20:37:35 2018 +0100 Release 3.2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 906 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 5 files changed, 456 insertions(+), 472 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2936f3f9bb9dc01c5954…

1 0

Tag wine-3.2 : Alexandre Julliard : Release 3.2
by Alexandre Julliard 16 Feb '18

16 Feb '18

Module: wine Branch: refs/tags/wine-3.2 Tag: 3605adb9657cb21c1f5f63338d7baba16eb5e625 URL: https://source.winehq.org/git/wine.git/?a=tag;h=3605adb9657cb21c1f5f63338d7… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 16 20:37:35 2018 +0100 Release 3.2

1 0

Henri Verbeet : d3d11: Set resource access based on usage and CPU access flags.
by Alexandre Julliard 16 Feb '18

16 Feb '18

Module: wine Branch: master Commit: b6f917b1023ea2b9591f6b72d34ff2afa34bd914 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6f917b1023ea2b9591f6b72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 16 09:57:04 2018 +0330 d3d11: Set resource access based on usage and CPU access flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 16 ++++++++-------- dlls/d3d11/buffer.c | 4 +--- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/tests/d3d11.c | 8 ++++---- dlls/d3d11/texture.c | 8 ++++---- dlls/d3d11/utils.c | 15 +++++++++++++++ dlls/d3d8/volume.c | 2 ++ dlls/d3d9/volume.c | 2 ++ dlls/wined3d/resource.c | 2 +- 9 files changed, 38 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6f917b1023ea2b9591f…

1 0

Henri Verbeet : ddraw: Explicitly translate resource map flags.
by Alexandre Julliard 16 Feb '18

16 Feb '18

Module: wine Branch: master Commit: 72c31c146be3e425d948f9f5cdca5a98915f9b4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=72c31c146be3e425d948f9f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 16 09:57:05 2018 +0330 ddraw: Explicitly translate resource map flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 3 ++- dlls/ddraw/utils.c | 20 ++++++++++++++++++++ dlls/ddraw/vertexbuffer.c | 14 ++------------ 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index af58c11..3cf9b76 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -587,6 +587,7 @@ void ddrawformat_from_wined3dformat(DDPIXELFORMAT *ddraw_format, BOOL wined3d_colour_from_ddraw_colour(const DDPIXELFORMAT *pf, const struct ddraw_palette *palette, DWORD colour, struct wined3d_color *wined3d_colour) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_ddrawformat(const DDPIXELFORMAT *format) DECLSPEC_HIDDEN; +unsigned int wined3dmapflags_from_ddrawmapflags(unsigned int flags) DECLSPEC_HIDDEN; void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd) DECLSPEC_HIDDEN; void dump_D3DMATRIX(const D3DMATRIX *mat) DECLSPEC_HIDDEN; void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6307911..f09aaba 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -992,7 +992,8 @@ static HRESULT surface_lock(struct ddraw_surface *surface, hr = ddraw_surface_update_frontbuffer(surface, rect, TRUE); if (SUCCEEDED(hr)) hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), - surface->sub_resource_idx, &map_desc, rect ? &box : NULL, flags); + surface->sub_resource_idx, &map_desc, rect ? &box : NULL, + wined3dmapflags_from_ddrawmapflags(flags)); if (FAILED(hr)) { wined3d_mutex_unlock(); diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 3785158..bb75666 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -561,6 +561,26 @@ enum wined3d_format_id wined3dformat_from_ddrawformat(const DDPIXELFORMAT *DDPix return WINED3DFMT_UNKNOWN; } +unsigned int wined3dmapflags_from_ddrawmapflags(unsigned int flags) +{ + static const unsigned int handled = DDLOCK_READONLY + | DDLOCK_NOSYSLOCK + | DDLOCK_NOOVERWRITE + | DDLOCK_DISCARDCONTENTS + | DDLOCK_DONOTWAIT; + unsigned int wined3d_flags; + + wined3d_flags = flags & handled; + if (flags & DDLOCK_NODIRTYUPDATE) + wined3d_flags |= WINED3D_MAP_NO_DIRTY_UPDATE; + flags &= ~(handled | DDLOCK_WAIT | DDLOCK_NODIRTYUPDATE); + + if (flags) + FIXME("Unhandled flags %#x.\n", flags); + + return wined3d_flags; +} + static float colour_to_float(DWORD colour, DWORD mask) { if (!mask) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index f89b620..b661e73 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -162,26 +162,16 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, struct wined3d_resource *wined3d_resource; struct wined3d_map_desc wined3d_map_desc; HRESULT hr; - DWORD wined3d_flags = 0; TRACE("iface %p, flags %#x, data %p, data_size %p.\n", iface, flags, data, data_size); if (buffer->version != 7) flags &= ~(DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS); - /* Writeonly: Pointless. Event: Unsupported by native according to the sdk - * nosyslock: Not applicable - */ if (!(flags & DDLOCK_WAIT)) - wined3d_flags |= WINED3D_MAP_DONOTWAIT; - if (flags & DDLOCK_READONLY) - wined3d_flags |= WINED3D_MAP_READONLY; - if (flags & DDLOCK_NOOVERWRITE) - wined3d_flags |= WINED3D_MAP_NOOVERWRITE; + flags |= DDLOCK_DONOTWAIT; if (flags & DDLOCK_DISCARDCONTENTS) { - wined3d_flags |= WINED3D_MAP_DISCARD; - if (!buffer->dynamic) { struct wined3d_buffer *new_buffer; @@ -211,7 +201,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, } hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), - 0, &wined3d_map_desc, NULL, wined3d_flags); + 0, &wined3d_map_desc, NULL, wined3dmapflags_from_ddrawmapflags(flags)); *data = wined3d_map_desc.data; wined3d_mutex_unlock();

1 0