September 2017 - Wine-commits

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: Add ARB_texture_filter_anisotropic extension.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 5b7a6d424eefb5261049f60473d6c94099a89722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7a6d424eefb5261049f6047… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 15 15:12:28 2017 +0200 wined3d: Add ARB_texture_filter_anisotropic extension. 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/directx.c | 14 ++++++++------ dlls/wined3d/sampler.c | 4 ++-- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_gl.h | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3da751e..168e494 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -175,6 +175,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_cube_map_array", ARB_TEXTURE_CUBE_MAP_ARRAY }, {"GL_ARB_texture_env_combine", ARB_TEXTURE_ENV_COMBINE }, {"GL_ARB_texture_env_dot3", ARB_TEXTURE_ENV_DOT3 }, + {"GL_ARB_texture_filter_anisotropic", ARB_TEXTURE_FILTER_ANISOTROPIC}, {"GL_ARB_texture_float", ARB_TEXTURE_FLOAT }, {"GL_ARB_texture_gather", ARB_TEXTURE_GATHER }, {"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT }, @@ -233,7 +234,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture_compression_s3tc", EXT_TEXTURE_COMPRESSION_S3TC }, {"GL_EXT_texture_env_combine", EXT_TEXTURE_ENV_COMBINE }, {"GL_EXT_texture_env_dot3", EXT_TEXTURE_ENV_DOT3 }, - {"GL_EXT_texture_filter_anisotropic", EXT_TEXTURE_FILTER_ANISOTROPIC}, + {"GL_EXT_texture_filter_anisotropic", ARB_TEXTURE_FILTER_ANISOTROPIC}, {"GL_EXT_texture_integer", EXT_TEXTURE_INTEGER }, {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS }, {"GL_EXT_texture_mirror_clamp", EXT_TEXTURE_MIRROR_CLAMP }, @@ -3595,9 +3596,9 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.texture3d_size = gl_max; TRACE("Max texture3D size: %d.\n", gl_info->limits.texture3d_size); } - if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC]) + if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &gl_max); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY, &gl_max); gl_info->limits.anisotropy = gl_max; TRACE("Max anisotropy: %d.\n", gl_info->limits.anisotropy); } @@ -3904,6 +3905,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_DERIVATIVE_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_PIPELINE_STATISTICS_QUERY, MAKEDWORD_VERSION(4, 6)}, + {ARB_TEXTURE_FILTER_ANISOTROPIC, MAKEDWORD_VERSION(4, 6)}, }; struct wined3d_driver_info *driver_info = &adapter->driver_info; const char *gl_vendor_str, *gl_renderer_str, *gl_version_str; @@ -5631,7 +5633,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPRASTERCAPS_SLOPESCALEDEPTHBIAS | WINED3DPRASTERCAPS_DEPTHBIAS; - if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC]) + if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) { caps->RasterCaps |= WINED3DPRASTERCAPS_ANISOTROPY | WINED3DPRASTERCAPS_ZBIAS | @@ -5750,7 +5752,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPTFILTERCAPS_MIPNEAREST | WINED3DPTFILTERCAPS_NEAREST; - if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC]) + if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) { caps->TextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC | WINED3DPTFILTERCAPS_MINFANISOTROPIC; @@ -5771,7 +5773,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPTFILTERCAPS_MIPNEAREST | WINED3DPTFILTERCAPS_NEAREST; - if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC]) + if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) { caps->CubeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC | WINED3DPTFILTERCAPS_MINFANISOTROPIC; diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 86d23a0..8c8d24c 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -98,8 +98,8 @@ static void wined3d_sampler_cs_init(void *object) GL_EXTCALL(glSamplerParameterf(sampler->name, GL_TEXTURE_LOD_BIAS, desc->lod_bias)); GL_EXTCALL(glSamplerParameterf(sampler->name, GL_TEXTURE_MIN_LOD, desc->min_lod)); GL_EXTCALL(glSamplerParameterf(sampler->name, GL_TEXTURE_MAX_LOD, desc->max_lod)); - if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC]) - GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_MAX_ANISOTROPY_EXT, desc->max_anisotropy)); + if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) + GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_MAX_ANISOTROPY, desc->max_anisotropy)); if (desc->compare) GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE)); GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_COMPARE_FUNC, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 476295c..230f94c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -851,8 +851,8 @@ void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture, state = sampler_desc->max_anisotropy; if (state != gl_tex->sampler_desc.max_anisotropy) { - if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC]) - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MAX_ANISOTROPY_EXT, state); + if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MAX_ANISOTROPY, state); else WARN("Anisotropic filtering not supported.\n"); gl_tex->sampler_desc.max_anisotropy = state; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2a51a7e..33fbe76 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -109,6 +109,7 @@ enum wined3d_gl_extension ARB_TEXTURE_CUBE_MAP_ARRAY, ARB_TEXTURE_ENV_COMBINE, ARB_TEXTURE_ENV_DOT3, + ARB_TEXTURE_FILTER_ANISOTROPIC, ARB_TEXTURE_FLOAT, ARB_TEXTURE_GATHER, ARB_TEXTURE_MIRRORED_REPEAT, @@ -165,7 +166,6 @@ enum wined3d_gl_extension EXT_TEXTURE_COMPRESSION_S3TC, EXT_TEXTURE_ENV_COMBINE, EXT_TEXTURE_ENV_DOT3, - EXT_TEXTURE_FILTER_ANISOTROPIC, EXT_TEXTURE_INTEGER, EXT_TEXTURE_LOD_BIAS, EXT_TEXTURE_MIRROR_CLAMP,

1 0

Nikolay Sivov : d3d9/tests: Test for GetDC() -capable backbuffer created with D3DFMT_UNKNOWN format.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: be1f61e27518428bec8be95930824b5ea9a47b9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=be1f61e27518428bec8be9593… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 16 17:30:27 2017 +0300 d3d9/tests: Test for GetDC()-capable backbuffer created with D3DFMT_UNKNOWN format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 5f904a2..d9cfb02b 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -34,11 +34,13 @@ struct vec3 float x, y, z; }; -#define CREATE_DEVICE_FULLSCREEN 0x01 -#define CREATE_DEVICE_NOWINDOWCHANGES 0x02 -#define CREATE_DEVICE_FPU_PRESERVE 0x04 -#define CREATE_DEVICE_SWVP_ONLY 0x08 -#define CREATE_DEVICE_MIXED_ONLY 0x10 +#define CREATE_DEVICE_FULLSCREEN 0x01 +#define CREATE_DEVICE_NOWINDOWCHANGES 0x02 +#define CREATE_DEVICE_FPU_PRESERVE 0x04 +#define CREATE_DEVICE_SWVP_ONLY 0x08 +#define CREATE_DEVICE_MIXED_ONLY 0x10 +#define CREATE_DEVICE_UNKNOWN_BACKBUFFER_FORMAT 0x20 +#define CREATE_DEVICE_LOCKABLE_BACKBUFFER 0x40 struct device_desc { @@ -152,8 +154,12 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, cons { present_parameters.BackBufferWidth = desc->width; present_parameters.BackBufferHeight = desc->height; + if (desc->flags & CREATE_DEVICE_UNKNOWN_BACKBUFFER_FORMAT) + present_parameters.BackBufferFormat = D3DFMT_UNKNOWN; present_parameters.hDeviceWindow = desc->device_window; present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); + if (desc->flags & CREATE_DEVICE_LOCKABLE_BACKBUFFER) + present_parameters.Flags |= D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; if (desc->flags & CREATE_DEVICE_SWVP_ONLY) behavior_flags = D3DCREATE_SOFTWARE_VERTEXPROCESSING; else if (desc->flags & CREATE_DEVICE_MIXED_ONLY) @@ -7956,6 +7962,7 @@ static void test_getdc(void) }; IDirect3DSurface9 *surface, *surface2; IDirect3DCubeTexture9 *cube_texture; + struct device_desc device_desc; IDirect3DTexture9 *texture; IDirect3DDevice9 *device; D3DLOCKED_RECT map_desc; @@ -8238,6 +8245,31 @@ static void test_getdc(void) refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + /* Backbuffer created with D3DFMT_UNKNOWN format. */ + device_desc.width = 640; + device_desc.height = 480; + device_desc.device_window = window; + device_desc.flags = CREATE_DEVICE_UNKNOWN_BACKBUFFER_FORMAT | CREATE_DEVICE_LOCKABLE_BACKBUFFER; + + device = create_device(d3d, window, &device_desc); + ok(!!device, "Failed to create device.\n"); + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &surface); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + + dc = NULL; + hr = IDirect3DSurface9_GetDC(surface, &dc); + ok(!!dc, "Unexpected DC returned.\n"); + ok(SUCCEEDED(hr), "Failed to get backbuffer DC, hr %#x.\n", hr); + hr = IDirect3DSurface9_ReleaseDC(surface, dc); + ok(SUCCEEDED(hr), "Failed to release backbuffer DC, hr %#x.\n", hr); + + IDirect3DSurface9_Release(surface); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); DestroyWindow(window); }

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

Nikolay Sivov : shell32/tests: Remove workarounds that are no longer relevant.
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: master Commit: 03cdddc08c80d1eb0370dd706ed85a0faedfe6cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=03cdddc08c80d1eb0370dd706… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 15 13:14:16 2017 +0300 shell32/tests: Remove workarounds that are no longer relevant. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 164 ++++++++++++------------------------- 1 file changed, 53 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03cdddc08c80d1eb0370d…

1 0

Nikolay Sivov : shell32: Implement Application property for FolderItem.
by Alexandre Julliard 15 Sep '17

15 Sep '17

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

Jonathan Doron : kernel32/tests: Test suspended process states.
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: master Commit: 6a49f4d5f3896b5f56641bf1a75098972db1aa20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a49f4d5f3896b5f56641bf1a… Author: Jonathan Doron <jond(a)wizery.com> Date: Thu Sep 14 11:49:36 2017 +0300 kernel32/tests: Test suspended process states. Signed-off-by: Jonathan Doron <jond(a)wizery.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 234 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 234 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a49f4d5f3896b5f56641…

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

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