wine-commits February 2018

wine-commits@winehq.org

2 participants
804 discussions

Francois Gouget : testbot: Make the job scheduler more extensible.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: tools Branch: master Commit: 66723015efdc15538bbb8c01ea91543f68893627 URL: https://source.winehq.org/git/tools.git/?a=commit;h=66723015efdc15538bbb8c0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 19 04:25:04 2018 +0100 testbot: Make the job scheduler more extensible. - The new scheduler splits the work into smaller steps: assessing the current situation, starting tasks on idle VMs and building a list of needed VMs, reverting the VMs, powering off the remaining VMs, updating the activity records. Each part can be analyzed independently. It uses the $Sched structure to pass information between these functions. - Sometimes a VM that no Task needs must be powered off in order to be able to prepare a VM that is needed. The job of picking which VM to sacrifice is now delegated to _SacrificeVM(). - The scheduler used to handle each VM host independently. As a result it was unable to prepare a VM for the 'next step' if that VM was on another VM host. The lack of a global picture also made many other extensions impossible. The new scheduler handles scheduling on all VM hosts at the same time, thus solving this issue. - This and other improvements mean the scheduler no longer needs to loop over the jobs and tasks multiple times. - In order to respect the per-VM-host limits the scheduler stores the host-related counters and limits in the $Sched->{hosts} table. - The scheduler also used to build multiple lists of VMs to revert depending on whether they were needed now, for the next step, or for future jobs. The new scheduler builds a single prioritised list of VMs to revert which can be handled in one go. It also keeps more information so it can better decide which VM to prepare next. - The scheduler can now also prepare VMs for the 'next step' earlier, thus making it more likely they will be ready in time. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 914 ++++++++++++++++++++++++++++------------ 1 file changed, 637 insertions(+), 277 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=66723015efdc15538bb…

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 : 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 : 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 : 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

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

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

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

Jacek Caban : mshtml: Added IDOMKeyboardEvent::which and IDOMMouseEvent:: which properties implementation.
by Alexandre Julliard 16 Feb '18

16 Feb '18

Module: wine Branch: master Commit: abd27e0926f01ca3a82f18ba6e00ad08cb046544 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abd27e0926f01ca3a82f18ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 16 16:36:14 2018 +0100 mshtml: Added IDOMKeyboardEvent::which and IDOMMouseEvent::which properties implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 26 ++++++++++++++++++++++---- dlls/mshtml/tests/events.js | 4 ++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 413ca2d..3a83e47 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1619,8 +1619,17 @@ static HRESULT WINAPI DOMMouseEvent_get_layerY(IDOMMouseEvent *iface, LONG *p) static HRESULT WINAPI DOMMouseEvent_get_which(IDOMMouseEvent *iface, USHORT *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + UINT32 r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetWhich(This->mouse_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static const IDOMMouseEventVtbl DOMMouseEventVtbl = { @@ -1874,8 +1883,17 @@ static HRESULT WINAPI DOMKeyboardEvent_get_charCode(IDOMKeyboardEvent *iface, LO static HRESULT WINAPI DOMKeyboardEvent_get_which(IDOMKeyboardEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + UINT32 r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMKeyEvent_GetWhich(This->keyboard_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static HRESULT WINAPI DOMKeyboardEvent_get_char(IDOMKeyboardEvent *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index c5030d0..f645e37 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -628,6 +628,7 @@ function test_mouse_event() { ok(e.buttons === 0, "buttons = " + e.buttons); ok(e.pageX === 0, "pageX = " + e.pageX); ok(e.pageY === 0, "pageY = " + e.pageY); + ok(e.which === 1, "which = " + e.which); e.initMouseEvent("test", true, true, window, 1, 2, 3, 4, 5, false, false, false, false, 1, document); ok(e.type === "test", "type = " + e.type); @@ -646,6 +647,7 @@ function test_mouse_event() { ok(e.metaKey === false, "metaKey = " + e.metaKey); ok(e.button === 1, "button = " + e.button); ok(e.buttons === 0, "buttons = " + e.buttons); + ok(e.which === 2, "which = " + e.which); e.initMouseEvent("test", false, false, window, 9, 8, 7, 6, 5, true, true, true, true, 127, document); ok(e.type === "test", "type = " + e.type); @@ -661,6 +663,7 @@ function test_mouse_event() { ok(e.shiftKey === true, "shiftKey = " + e.shiftKey); ok(e.metaKey === true, "metaKey = " + e.metaKey); ok(e.button === 127, "button = " + e.button); + ok(e.which === 128, "which = " + e.which); e.initEvent("testevent", true, true); ok(e.type === "testevent", "type = " + e.type); @@ -728,6 +731,7 @@ function test_keyboard_event() { ok(e.metaKey === false, "metaKey = " + e.metaKey); ok(e.location === 0, "location = " + e.location); ok(e.detail === 0, "detail = " + e.detail); + ok(e.which === 0, "which = " + e.which); next_test(); }

1 0

Józef Kucia : wined3d: Use renderbuffers when resolving multisample textures with conversion.
by Alexandre Julliard 16 Feb '18

16 Feb '18

Module: wine Branch: master Commit: de9ebcff70a41d1600c26734b3b0f2b3935992d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de9ebcff70a41d1600c26734… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 16 15:13:33 2018 +0100 wined3d: Use renderbuffers when resolving multisample textures with conversion. Direct3D 9 allows blits from multisample resources to non-multisample resources with scaling or format conversion. In OpenGL, we resolve multisample texture to the renderbuffer associated with the texture before doing the actual blit with scaling/format conversion. 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/surface.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1f5a98a..5cb9cda 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -350,6 +350,15 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, context_release(context); } +static BOOL is_multisample_location(const struct wined3d_texture *texture, DWORD location) +{ + if (location == WINED3D_LOCATION_RB_MULTISAMPLE) + return TRUE; + if (location != WINED3D_LOCATION_TEXTURE_RGB && location != WINED3D_LOCATION_TEXTURE_SRGB) + return FALSE; + return texture->target == GL_TEXTURE_2D_MULTISAMPLE || texture->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY; +} + /* Blit between surface locations. Onscreen on different swapchains is not supported. * Depth / stencil is not supported. Context activation is done by the caller. */ static void surface_blt_fbo(const struct wined3d_device *device, @@ -392,7 +401,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, } /* Resolve the source surface first if needed. */ - if (src_location == WINED3D_LOCATION_RB_MULTISAMPLE + if (is_multisample_location(src_texture, src_location) && (src_texture->resource.format->id != dst_texture->resource.format->id || abs(src_rect.bottom - src_rect.top) != abs(dst_rect.bottom - dst_rect.top) || abs(src_rect.right - src_rect.left) != abs(dst_rect.right - dst_rect.left)))

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
81
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 February 2018