September 2017 - Wine-Commits

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

Sept. 18, 2017

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

Matteo Bruni : wined3d: Always initialize fx field in struct wined3d_cs_blt_sub_resource ( Valgrind).
by Alexandre Julliard Sept. 18, 2017

Sept. 18, 2017

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 Sept. 18, 2017

Sept. 18, 2017

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

Alexandre Julliard : Wine release 2.17
by Alexandre Julliard Sept. 15, 2017

Sept. 15, 2017

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

Matteo Bruni : opengl32: Update to OpenGL 4.6.
by Alexandre Julliard Sept. 15, 2017

Sept. 15, 2017

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/tests: Fix typo in ok() condition.
by Alexandre Julliard Sept. 15, 2017

Sept. 15, 2017

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

Tag wine-2.17 : Alexandre Julliard : Release 2.17
by Alexandre Julliard Sept. 15, 2017

Sept. 15, 2017

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 Sept. 15, 2017

Sept. 15, 2017

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 Sept. 15, 2017

Sept. 15, 2017

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

Nikolay Sivov : shell32: Implement Application property for FolderItem.
by Alexandre Julliard Sept. 15, 2017

Sept. 15, 2017

Module: wine Branch: master Commit: a1f7339137a2857674a1b2835ed9539bbbafe415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1f7339137a2857674a1b2835… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 15 13:14:17 2017 +0300 shell32: Implement Application property for FolderItem. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 28 +++++++++++++++++----------- dlls/shell32/tests/shelldispatch.c | 25 +++++++++++++++++++++---- 2 files changed, 38 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index a225f45..ee6f340 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -77,6 +77,7 @@ typedef struct { typedef struct { FolderItem2 FolderItem2_iface; LONG ref; + FolderImpl *folder; VARIANT dir; } FolderItemImpl; @@ -646,6 +647,7 @@ static ULONG WINAPI FolderItemImpl_Release(FolderItem2 *iface) if (!ref) { VariantClear(&This->dir); + Folder3_Release(&This->folder->Folder3_iface); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -707,13 +709,13 @@ static HRESULT WINAPI FolderItemImpl_Invoke(FolderItem2 *iface, return hr; } -static HRESULT WINAPI FolderItemImpl_get_Application(FolderItem2 *iface, - IDispatch **ppid) +static HRESULT WINAPI FolderItemImpl_get_Application(FolderItem2 *iface, IDispatch **disp) { - FIXME("(%p,%p)\n", iface, ppid); + FolderItemImpl *This = impl_from_FolderItem(iface); - *ppid = NULL; - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, disp); + + return Folder3_get_Application(&This->folder->Folder3_iface, disp); } static HRESULT WINAPI FolderItemImpl_get_Parent(FolderItem2 *iface, @@ -928,7 +930,7 @@ static const FolderItem2Vtbl FolderItemImpl_Vtbl = { FolderItemImpl_ExtendedProperty }; -static HRESULT FolderItem_Constructor(VARIANT *dir, FolderItem **ppfi) +static HRESULT FolderItem_Constructor(FolderImpl *folder, VARIANT *dir, FolderItem **ppfi) { FolderItemImpl *This; HRESULT ret; @@ -950,7 +952,10 @@ static HRESULT FolderItem_Constructor(VARIANT *dir, FolderItem **ppfi) return E_OUTOFMEMORY; } - *ppfi = (FolderItem*)&This->FolderItem2_iface; + This->folder = folder; + Folder3_AddRef(&folder->Folder3_iface); + + *ppfi = (FolderItem *)&This->FolderItem2_iface; return ret; } @@ -1137,7 +1142,7 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F break; case VT_ERROR: - return FolderItem_Constructor(&This->folder->dir, ppid); + return FolderItem_Constructor(This->folder, &This->folder->dir, ppid); default: return E_NOTIMPL; @@ -1145,7 +1150,7 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F V_VT(&path_var) = VT_BSTR; V_BSTR(&path_var) = SysAllocString(path_str); - ret = FolderItem_Constructor(&path_var, ppid); + ret = FolderItem_Constructor(This->folder, &path_var, ppid); VariantClear(&path_var); return ret; } @@ -1451,6 +1456,7 @@ static HRESULT WINAPI FolderImpl_Items(Folder3 *iface, FolderItems **ppid) static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR name, FolderItem **item) { + FolderImpl *This = impl_from_Folder(iface); FolderItem *self; BSTR str; WCHAR pathW[MAX_PATH]; @@ -1479,7 +1485,7 @@ static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR name, FolderItem V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(pathW); - hr = FolderItem_Constructor(&v, item); + hr = FolderItem_Constructor(This, &v, item); VariantClear(&v); return hr; } @@ -1523,7 +1529,7 @@ static HRESULT WINAPI FolderImpl_get_Self(Folder3 *iface, FolderItem **ppfi) TRACE("(%p,%p)\n", iface, ppfi); - return FolderItem_Constructor(&This->dir, ppfi); + return FolderItem_Constructor(This, &This->dir, ppfi); } static HRESULT WINAPI FolderImpl_get_OfflineStatus(Folder3 *iface, LONG *pul) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 831402a..eb8a8c7 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -483,7 +483,7 @@ static void test_items(void) if (item) FolderItem_Release(item); VariantClear(&var); - /* recreate the folder object */ + /* recreate the items object */ FolderItems_Release(items); items = NULL; r = Folder_Items(folder, &items); @@ -491,7 +491,11 @@ static void test_items(void) ok(!!items, "items is null\n"); r = FolderItems_QueryInterface(items, &IID_FolderItems2, (void**)&items2); ok(r == S_OK || broken(r == E_NOINTERFACE) /* xp and later */, "FolderItems::QueryInterface failed: %08x\n", r); - if (r == S_OK) ok(!!items2, "items2 is null\n"); + if (r == S_OK) + { + ok(!!items2, "items2 is null\n"); + FolderItems2_Release(items2); + } r = FolderItems_QueryInterface(items, &IID_FolderItems3, (void**)&items3); ok(r == S_OK, "FolderItems::QueryInterface failed: %08x\n", r); ok(!!items3, "items3 is null\n"); @@ -510,11 +514,25 @@ static void test_items(void) V_VT(&var) = VT_I2; V_I2(&var) = 0; + + EXPECT_REF(folder, 2); + EXPECT_REF(items, 2); item = NULL; r = FolderItems_Item(items, var, &item); ok(r == S_OK, "FolderItems::Item failed: %08x\n", r); ok(!!item, "item is null\n"); - if (item) FolderItem_Release(item); + EXPECT_REF(folder, 3); + EXPECT_REF(items, 2); + + r = Folder_get_Application(folder, &disp); + ok(r == S_OK, "Failed to get application pointer %#x.\n", r); + r = FolderItem_get_Application(item, &disp2); + ok(r == S_OK, "Failed to get application pointer %#x.\n", r); + ok(disp == disp2, "Unexpected application pointer.\n"); + IDispatch_Release(disp2); + IDispatch_Release(disp); + + FolderItem_Release(item); V_VT(&var) = VT_I4; V_I4(&var) = 0; @@ -740,7 +758,6 @@ todo_wine FolderItems_Release(items); Folder_Release(folder); - if (items2) FolderItems2_Release(items2); if (items3) FolderItems3_Release(items3); IShellDispatch_Release(sd); }

1 0