wine-commits September 2017

wine-commits@winehq.org

2 participants
446 discussions

Matteo Bruni : wined3d: Always initialize fx field in struct wined3d_cs_blt_sub_resource ( Valgrind).
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: aac99bf2ce4aa9b26c42dbf50ce056e5a79342c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aac99bf2ce4aa9b26c42dbf50… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 15 15:12:24 2017 +0200 wined3d: Always initialize fx field in struct wined3d_cs_blt_sub_resource (Valgrind). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b3b6588..04e01da 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2110,6 +2110,8 @@ void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_reso op->flags = flags; if (fx) op->fx = *fx; + else + memset(&op->fx, 0, sizeof(op->fx)); op->filter = filter; wined3d_resource_acquire(dst_resource);

1 0

Matteo Bruni : wined3d: Consider all the system memory locations when choosing the surface upload path.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 10a62ee062b71011f66349f34fc6027566829f48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a62ee062b71011f66349f34… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 15 15:12:23 2017 +0200 wined3d: Consider all the system memory locations when choosing the surface upload path. Signed-off-by: Matteo Bruni <mbruni(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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f35d5df..134b6d2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3709,8 +3709,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst { blit_op = WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST; } - else if ((src_sub_resource->locations & WINED3D_LOCATION_SYSMEM) - && !(dst_sub_resource->locations & WINED3D_LOCATION_SYSMEM)) + else if ((src_sub_resource->locations & surface_simple_locations) + && !(dst_sub_resource->locations & surface_simple_locations)) { /* Upload */ if (scale)

1 0

Matteo Bruni : wined3d: Don' t claim SYSMEM location to be current if memory was evicted.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 58016408c2d12dbf35797f6910f9e9d14d941c50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58016408c2d12dbf35797f691… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 15 15:12:22 2017 +0200 wined3d: Don't claim SYSMEM location to be current if memory was evicted. Signed-off-by: Matteo Bruni <mbruni(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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 608447f..f35d5df 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3539,7 +3539,8 @@ static DWORD cpu_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit ERR("Failed to blit.\n"); wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location); - return dst_texture->resource.map_binding | dst_location; + return dst_location | (dst_texture->sub_resources[dst_sub_resource_idx].locations + & dst_texture->resource.map_binding); } static const struct wined3d_blitter_ops cpu_blitter_ops =

1 0

Alexandre Julliard : Wine release 2.17
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: website Branch: master Commit: e65b16eb366ce75f435ee01ae34aaa11c25e520b URL: http://source.winehq.org/git/website.git/?a=commit;h=e65b16eb366ce75f435ee0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 15 20:12:14 2017 +0200 Wine release 2.17 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017091501.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2017091501.xml b/news/en/2017091501.xml new file mode 100644 index 0000000..c99c555 --- /dev/null +++ b/news/en/2017091501.xml @@ -0,0 +1,17 @@ +<news> +<date>September 15, 2017</date> +<title>Wine 2.17 Released</title> +<body> + The Wine development release 2.17 is now available. + <a href="{$root}/announce/2.17">What's new</a> in this release: +<ul> + <li>Better support for grayscale mode in DirectWrite.</li> + <li>Per-application StartupWMClass in desktop files.</li> + <li>Virtual memory compatibility improvements.</li> + <li>Palette handling improvements in WindowsCodecs.</li> + <li>Reply messages improvements in WebServices.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.17.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-2.17 : Alexandre Julliard : Release 2.17
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: refs/tags/wine-2.17 Tag: f723ae27dff8d8669316bcd143b24955d87aa77d URL: http://source.winehq.org/git/wine.git/?a=tag;h=f723ae27dff8d8669316bcd143b2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 15 20:09:32 2017 +0200 Release 2.17

1 0

Alexandre Julliard : Release 2.17.
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: master Commit: bb16263fe1974851f495435fef9a3d57fa2d4aa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb16263fe1974851f495435fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 15 20:09:32 2017 +0200 Release 2.17. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 491 ++++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +-- 3 files changed, 264 insertions(+), 247 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb16263fe1974851f4954…

1 0

Zebediah Figura : dsquery: Register CommonQuery coclass.
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: master Commit: 1d311fd4a459c4d904426913e21e1c5e4abcae0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d311fd4a459c4d904426913e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 15 11:41:39 2017 -0500 dsquery: Register CommonQuery coclass. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/dsquery/Makefile.in | 3 +++ dlls/dsquery/dsquery.idl | 23 +++++++++++++++++++++++ include/cmnquery.idl | 12 +++++++++++- 5 files changed, 39 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 47a41cd..18717e8 100755 --- a/configure +++ b/configure @@ -18307,7 +18307,7 @@ wine_fn_config_dll dpwsockx enable_dpwsockx wine_fn_config_dll drmclien enable_drmclien wine_fn_config_dll dsound enable_dsound clean,implib wine_fn_config_test dlls/dsound/tests dsound_test -wine_fn_config_dll dsquery enable_dsquery +wine_fn_config_dll dsquery enable_dsquery clean wine_fn_config_dll dssenh enable_dssenh wine_fn_config_test dlls/dssenh/tests dssenh_test wine_fn_config_dll dswave enable_dswave clean diff --git a/configure.ac b/configure.ac index cd5a50b..f01162b 100644 --- a/configure.ac +++ b/configure.ac @@ -3097,7 +3097,7 @@ WINE_CONFIG_DLL(dpwsockx) WINE_CONFIG_DLL(drmclien) WINE_CONFIG_DLL(dsound,,[clean,implib]) WINE_CONFIG_TEST(dlls/dsound/tests) -WINE_CONFIG_DLL(dsquery) +WINE_CONFIG_DLL(dsquery,,[clean]) WINE_CONFIG_DLL(dssenh) WINE_CONFIG_TEST(dlls/dssenh/tests) WINE_CONFIG_DLL(dswave,,[clean]) diff --git a/dlls/dsquery/Makefile.in b/dlls/dsquery/Makefile.in index 8fbe92d..611e601 100644 --- a/dlls/dsquery/Makefile.in +++ b/dlls/dsquery/Makefile.in @@ -3,3 +3,6 @@ IMPORTS = uuid C_SRCS = \ main.c + +IDL_SRCS = \ + dsquery.idl diff --git a/dlls/dsquery/dsquery.idl b/dlls/dsquery/dsquery.idl new file mode 100644 index 0000000..22300ed --- /dev/null +++ b/dlls/dsquery/dsquery.idl @@ -0,0 +1,23 @@ +/* + * COM Classes for dsquery + * + * Copyright 2017 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +#include "cmnquery.idl" diff --git a/include/cmnquery.idl b/include/cmnquery.idl index 62411fd..2b89f84 100644 --- a/include/cmnquery.idl +++ b/include/cmnquery.idl @@ -18,6 +18,12 @@ import "oaidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + [ object, uuid(1a3114b8-a62e-11d0-a6c5-00a0c906af45), @@ -76,4 +82,8 @@ interface ICommonQuery : IUnknown HRESULT OpenQueryWindow([in] HWND parent, [in] LPOPENQUERYWINDOW query_window, [out] IDataObject **data_object); } -cpp_quote("DEFINE_GUID(CLSID_CommonQuery, 0x83bc5ec0, 0x6f2a, 0x11d0, 0xa1,0xc4, 0x00,0xaa,0x00,0xc1,0x6e,0x65);") +[ + threading(apartment), + uuid(83bc5ec0-6f2a-11d0-a1c4-00aa00c16e65) +] +coclass CommonQuery { interface ICommonQuery; }

1 0

Matteo Bruni : opengl32: Update to OpenGL 4.6.
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: master Commit: d6851e674889b355c0a12b50c6f676e8cec7e48a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6851e674889b355c0a12b50c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 15 15:12:27 2017 +0200 opengl32: Update to OpenGL 4.6. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/opengl_ext.c | 539 +++++++++++++++++++- dlls/opengl32/opengl_norm.c | 1156 ++++++------------------------------------- include/wine/wgl.h | 147 ++++++ include/wine/wgl_driver.h | 81 ++- 4 files changed, 909 insertions(+), 1014 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6851e674889b355c0a12…

1 0

Matteo Bruni : opengl32: Support a couple new typedefs in the XML.
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: master Commit: b4c5d73cc0c39c3765db432713f654a7e28e2e0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c5d73cc0c39c3765db43271… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 15 15:12:26 2017 +0200 opengl32: Support a couple new typedefs in the XML. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index deb95be..44d58ec 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -126,7 +126,9 @@ my %debug_conv = "GLDEBUGPROCARB" => "%p", "GLDEBUGPROCAMD" => "%p", "GLDEBUGPROCKHR" => "%p", + "GLeglClientBufferEXT" => "%p", "GLvdpauSurfaceNV" => "%ld", + "GLVULKANPROCNV" => "%p", "int" => "%d", "unsigned int" => "%u", "UINT" => "%u", @@ -195,6 +197,8 @@ sub ConvertType($) "GLDEBUGPROCARB" => "void *", "GLDEBUGPROCAMD" => "void *", "GLDEBUGPROCKHR" => "void *", + "GLeglClientBufferEXT" => "void *", + "GLVULKANPROCNV" => "void *", "HPBUFFERARB" => "struct wgl_pbuffer *", "HPBUFFEREXT" => "struct wgl_pbuffer *", ); @@ -228,9 +232,9 @@ sub ConvertVarName($) # # This functions generates the thunk for a given function. # -sub GenerateThunk($$$$) +sub GenerateThunk($$$) { - my ($name, $func_ref, $comment, $prefix) = @_; + my ($name, $func_ref, $prefix) = @_; my $ret = ""; my $call_arg = ""; my $trace_call_arg = ""; @@ -241,13 +245,6 @@ sub GenerateThunk($$$$) return "" if $name eq "glGetString"; return "" if $func_ref->[2] && $func_ref->[2]->[0] =~ /WGL_/; - # If for opengl_norm.c, generate a nice heading otherwise Patrik won't be happy :-) - # Patrik says: Well I would be even happier if a (OPENGL32.@) was added as well. Done. :-) - if ($comment eq 1) { - $ret .= "/***********************************************************************\n"; - $ret .= " * $name (OPENGL32.\@)\n"; - $ret .= " */\n"; - } $ret .= ConvertType($func_ref->[0]) . " WINAPI $name( "; for (my $i = 0; $i < @{$func_ref->[1]}; $i++) { my $type = $func_ref->[1]->[$i]->[0]; @@ -930,7 +927,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(opengl); "; foreach (sort keys %norm_functions) { - my $string = GenerateThunk($_, $norm_functions{$_}, 1, "gl"); + my $string = GenerateThunk($_, $norm_functions{$_}, "gl"); print NORM "\n$string" if $string; } @@ -980,7 +977,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(opengl); my $count = keys %ext_functions; print EXT "const int extension_registry_size = $count;\n"; foreach (sort keys %ext_functions) { - my $string = GenerateThunk($_, $ext_functions{$_}, 0, "ext"); + my $string = GenerateThunk($_, $ext_functions{$_}, "ext"); if ($string =~ /DECLSPEC_HIDDEN/) { print EXT "\n$string"; } else {

1 0

Matteo Bruni : opengl32/tests: Fix typo in ok() condition.
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: master Commit: 4d4a1477dc32ac33515fdbe635fc9190ab253e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d4a1477dc32ac33515fdbe63… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 15 15:12:25 2017 +0200 opengl32/tests: Fix typo in ok() condition. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 2810eee..fd68a99 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -404,7 +404,7 @@ static void test_setpixelformat(HDC winhdc) ok( GetLastError() == ERROR_INVALID_PIXEL_FORMAT, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); res = SetPixelFormat( hdc, pf, &pfd ); - ok( i == 0, "SetPixelFormat succeeded\n" ); + ok( !res, "SetPixelFormat succeeded\n" ); ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); res = DescribePixelFormat( hdc, 0, 0, NULL );

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
45
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 September 2017