wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Henri Verbeet : wined3d: Get resource info from the texture in read_from_framebuffer().
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: 1e8befdbf00ad7a013fdc0d5411a2c8814c682b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e8befdbf00ad7a013fdc0d54… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Mar 19 10:35:46 2016 +0100 wined3d: Get resource info from the texture in read_from_framebuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 297a34d..8efd85ee 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1992,7 +1992,8 @@ do { \ static void read_from_framebuffer(struct wined3d_surface *surface, struct wined3d_context *old_ctx, DWORD dst_location) { - struct wined3d_device *device = surface->resource.device; + struct wined3d_texture *texture = surface->container; + struct wined3d_device *device = texture->resource.device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context = old_ctx; struct wined3d_surface *restore_rt = NULL; @@ -2018,7 +2019,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, * There is no need to keep track of the current read buffer or reset it, every part of the code * that reads sets the read buffer as desired. */ - if (wined3d_resource_is_offscreen(&surface->container->resource)) + if (wined3d_resource_is_offscreen(&texture->resource)) { /* Mapping the primary render target which is not on a swapchain. * Read from the back buffer. */ @@ -2042,16 +2043,16 @@ static void read_from_framebuffer(struct wined3d_surface *surface, checkGLcall("glBindBuffer"); } - wined3d_texture_get_pitch(surface->container, surface->texture_level, &row_pitch, &slice_pitch); + wined3d_texture_get_pitch(texture, surface->texture_level, &row_pitch, &slice_pitch); /* Setup pixel store pack state -- to glReadPixels into the correct place */ - gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, row_pitch / surface->resource.format->byte_count); + gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, row_pitch / texture->resource.format->byte_count); checkGLcall("glPixelStorei"); gl_info->gl_ops.gl.p_glReadPixels(0, 0, surface->resource.width, surface->resource.height, - surface->resource.format->glFormat, - surface->resource.format->glType, data.addr); + texture->resource.format->glFormat, + texture->resource.format->glType, data.addr); checkGLcall("glReadPixels"); /* Reset previous pixel store pack state */

1 0

Alexandre Julliard : winebuild: Use strarray objects for a few more string arrays.
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: d65446af3db98499a43fc8dd856cc1f404424b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65446af3db98499a43fc8dd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 19 13:22:30 2016 +0900 winebuild: Use strarray objects for a few more string arrays. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 3 +-- tools/winebuild/import.c | 68 +++++++++++++++++------------------------------- tools/winebuild/main.c | 20 ++++++-------- tools/winebuild/utils.c | 14 +++------- 4 files changed, 36 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d65446af3db98499a43fc…

1 0

Alexandre Julliard : winebuild: Use strarray objects instead of pointers where possible.
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: 8baaf5349f5cfb01ea78c5d7b0592d4ae674caf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8baaf5349f5cfb01ea78c5d7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 19 13:10:09 2016 +0900 winebuild: Use strarray objects instead of pointers where possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 19 ++++----- tools/winebuild/import.c | 19 ++++----- tools/winebuild/main.c | 8 ++-- tools/winebuild/res32.c | 7 ++- tools/winebuild/utils.c | 108 +++++++++++++++++++++-------------------------- 5 files changed, 73 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8baaf5349f5cfb01ea78c…

1 0

Frédéric Delanoy : French translation for release 1.9.6
by Jeremy Newman 21 Mar '16

21 Mar '16

Module: website Branch: master Commit: 9b42fc5359d8f1041442baa599a6276120f6bd6f URL: http://source.winehq.org/git/website.git/?a=commit;h=9b42fc5359d8f1041442ba… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Mar 18 21:16:39 2016 +0100 French translation for release 1.9.6 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016031801.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2016031801.xml b/news/fr/2016031801.xml new file mode 100644 index 0000000..7a81ab8 --- /dev/null +++ b/news/fr/2016031801.xml @@ -0,0 +1,14 @@ +<news> +<date>18 mars 2016</date> +<title>Sortie de Wine 1.9.6</title> +<body> +La version de développement 1.9.6 de Wine est disponible. +<a href="{$root}/announce/1.9.6">Nouveautés</a> de cette version : +<ul> + <li>Meilleurs détection des cartes vidéo lorsque Mesa est utilisé.</li> + <li>Prise en charge des shaders Shader Model 5.</li> + <li>Améliorations dans le traitement des exceptions C++.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.6.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Francois Gouget : testbot: Let the WineRunTask script take screenshots.
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: tools Branch: master Commit: 8d728648bed2b17b73c34749ae79e9a083b028ba URL: http://source.winehq.org/git/tools.git/?a=commit;h=8d728648bed2b17b73c34749… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 20 07:35:22 2016 +0100 testbot: Let the WineRunTask script take screenshots. Taking a screenshot is a blocking operation that takes time. So it must not be done from the Engine. But taking screenshots from the task scripts is fine. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 5 ++++- testbot/lib/WineTestBot/VMs.pm | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 75a8851..956f180 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -523,7 +523,10 @@ sub HandleGetScreenshot($) return "0Unknown VM $VMName"; } - my ($ErrMessage, $ImageSize, $ImageBytes) = $VM->CaptureScreenImage(); + # FIXME: Taking a screenshot leaks libvirt connections, takes a long time and + # blocks the Engine during the whole operation. So live screenshots are + # disabled for now. + my ($ErrMessage, $ImageSize, $ImageBytes) = ("Screenshotting has been disabled for the time being", undef, undef); #$VM->CaptureScreenImage(); if (defined($ErrMessage)) { LogMsg "Failed to take screenshot of $VMName: $ErrMessage\n"; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2400efc..c41b77a 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -432,9 +432,6 @@ sub CaptureScreenImage($) { my ($self) = @_; - # FIXME: Disable screenshots for now - return ("Screenshotting has been disabled for the time being", undef, undef); - my ($ErrMessage, $Domain) = $self->_GetDomain(); return ($ErrMessage, undef, undef) if (defined $ErrMessage);

1 0

Jeremy Newman : fix opening PHP tag for PHP 5.6
by Jeremy Newman 21 Mar '16

21 Mar '16

Module: website Branch: master Commit: 174c1335fc2650d31b4c37d83241912ba78f636d URL: http://source.winehq.org/git/website.git/?a=commit;h=174c1335fc2650d31b4c37… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Mar 21 08:45:49 2016 -0500 fix opening PHP tag for PHP 5.6 --- include/wwn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wwn.php b/include/wwn.php index 1d81e7c..7203b2f 100644 --- a/include/wwn.php +++ b/include/wwn.php @@ -1,4 +1,4 @@ -<? +<?php /* WineHQ

1 0

Alexandre Julliard : Wine release 1.9.6
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: website Branch: master Commit: 83070d379296c35588419df138066d75c338f752 URL: http://source.winehq.org/git/website.git/?a=commit;h=83070d379296c35588419d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 22:33:14 2016 +0900 Wine release 1.9.6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016031801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2016031801.xml b/news/en/2016031801.xml new file mode 100644 index 0000000..83393e1 --- /dev/null +++ b/news/en/2016031801.xml @@ -0,0 +1,15 @@ +<news> +<date>March 18, 2016</date> +<title>Wine 1.9.6 Released</title> +<body> + The Wine development release 1.9.6 is now available. + <a href="{$root}/announce/1.9.6">What's new</a> in this release: +<ul> + <li>Better video card detection when using Mesa.</li> + <li>Support for Shader Model 5 shaders.</li> + <li>C++ exception handling improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.6.tar.bz2">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-1.9.6 : Alexandre Julliard : Release 1.9.6
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: wine Branch: refs/tags/wine-1.9.6 Tag: e2e545aff7dd1fdf53bcad4d44f8b620ea9f960c URL: http://source.winehq.org/git/wine.git/?a=tag;h=e2e545aff7dd1fdf53bcad4d44f8… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 22:31:01 2016 +0900 Release 1.9.6

1 0

Alexandre Julliard : Release 1.9.6.
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: wine Branch: master Commit: 6bc0ce26a853b51f11958545bfa5570bdcb1cf01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc0ce26a853b51f11958545b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 22:31:01 2016 +0900 Release 1.9.6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 758 +++++++++++++++++++++++++++----------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 342 insertions(+), 437 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bc0ce26a853b51f11958…

1 0

Piotr Caban : msvcrt: Destroy thrown c++ object before calling handler in _except_handler4_common.
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: wine Branch: master Commit: 4a397b4009e9fd5e9e8899456d177865af465291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a397b4009e9fd5e9e8899456… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 18 12:40:33 2016 +0100 msvcrt: Destroy thrown c++ object before calling handler in _except_handler4_common. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 2 ++ dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 7d7ec75..418c68b 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -950,6 +950,8 @@ int CDECL _except_handler4_common( ULONG *cookie, void (*check_cookie)(void), if (retval == EXCEPTION_EXECUTE_HANDLER) { + __DestructExceptionObject(rec); + /* Unwind all higher frames, this one will handle the exception */ _global_unwind2((EXCEPTION_REGISTRATION_RECORD*)frame); msvcrt_local_unwind4( cookie, frame, trylevel, &frame->_ebp ); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index fafdc6b..b564dc1 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -219,6 +219,7 @@ typedef struct BOOL __cdecl __CxxRegisterExceptionObject(EXCEPTION_RECORD**, cxx_frame_info*); void __cdecl __CxxUnregisterExceptionObject(cxx_frame_info*, BOOL); +void CDECL __DestructExceptionObject(EXCEPTION_RECORD*); /* TLS data */ extern DWORD msvcrt_tls_index DECLSPEC_HIDDEN;

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
73
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 March 2016