wine-commits July 2015

wine-commits@winehq.org

2 participants
567 discussions

Matteo Bruni : wined3d: Allow to apply extension emulation wrappers independently.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: 930d3e62692fb717079968f32a831975ff3107f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=930d3e62692fb717079968f32… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 27 14:29:55 2015 +0200 wined3d: Allow to apply extension emulation wrappers independently. --- dlls/wined3d/directx.c | 3 +- dlls/wined3d/gl_compat.c | 238 +++++++++++++---------------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 76 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=930d3e62692fb71707996…

1 0

Matteo Bruni : wined3d: Don't run check_filter() on core contexts.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: 12ef1756d2550c29873b8aec1a7dfaf1d3f0bbae URL: http://source.winehq.org/git/wine.git/?a=commit;h=12ef1756d2550c29873b8aec1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 27 14:29:54 2015 +0200 wined3d: Don't run check_filter() on core contexts. The code uses glBegin() / glEnd() and other APIs removed from core profile. --- dlls/wined3d/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6c871f1..e57db99 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2375,7 +2375,8 @@ static void init_format_filter_info(struct wined3d_gl_info *gl_info, enum wined3 /* This was already handled by init_format_texture_info(). */ return; - if(wined3d_settings.offscreen_rendering_mode != ORM_FBO) + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + || !gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) { WARN("No FBO support, or no FBO ORM, guessing filter info from GL caps\n"); if (vendor == HW_VENDOR_NVIDIA && gl_info->supported[ARB_TEXTURE_FLOAT])

1 0

Matteo Bruni : wined3d: Avoid glBegin() / glEnd() in check_fbo_compat() when possible.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: 53d152794574ce19d835340dda626845b2e85dc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d152794574ce19d835340dd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 27 14:29:53 2015 +0200 wined3d: Avoid glBegin() / glEnd() in check_fbo_compat() when possible. --- dlls/wined3d/directx.c | 27 +++---- dlls/wined3d/glsl_shader.c | 4 +- dlls/wined3d/utils.c | 156 ++++++++++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 19 ++++- 4 files changed, 164 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53d152794574ce19d8353…

1 0

Daniel Lehman : gdi32: Check for NULL pointer in GetOutlineTextMetrics.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: 22c51eeabf6f7dcdcdcb6f41d51b1faa8072aead URL: http://source.winehq.org/git/wine.git/?a=commit;h=22c51eeabf6f7dcdcdcb6f41d… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Jul 20 16:38:05 2015 -0700 gdi32: Check for NULL pointer in GetOutlineTextMetrics. --- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/tests/font.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9a7a3d7..1187598 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7722,7 +7722,7 @@ static UINT freetype_GetOutlineTextMetrics( PHYSDEV dev, UINT cbSize, OUTLINETEX if (physdev->font->potm || get_outline_text_metrics( physdev->font )) { - if(cbSize >= physdev->font->potm->otmSize) + if(potm && cbSize >= physdev->font->potm->otmSize) { memcpy(potm, physdev->font->potm, physdev->font->potm->otmSize); scale_outline_font_metrics(physdev->font, potm); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index cce4a1f..8595a4a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2147,6 +2147,11 @@ static void test_GetOutlineTextMetrics(void) } ok(otm->otmpFullName == unset_ptr, "expected %p got %p\n", unset_ptr, otm->otmpFullName); + /* check handling of NULL pointer */ + SetLastError(0xdeadbeef); + ret = GetOutlineTextMetricsA(hdc, otm_size, NULL); + ok(ret == otm_size, "expected %u, got %u, error %d\n", otm_size, ret, GetLastError()); + HeapFree(GetProcessHeap(), 0, otm); SelectObject(hdc, hfont_old);

1 0

Jacek Caban : include: Added inspectable.idl file.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: 5c000dca57f2bae082a729bfa667d429e0c4c836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c000dca57f2bae082a729bfa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 27 13:41:16 2015 +0200 include: Added inspectable.idl file. --- include/Makefile.in | 1 + include/inspectable.idl | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 3b8d8d1..f829712 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -62,6 +62,7 @@ PUBLIC_IDL_H_SRCS = \ indexsrv.idl \ inputscope.idl \ inseng.idl \ + inspectable.idl \ mediaobj.idl \ metahost.idl \ mimeinfo.idl \ diff --git a/include/inspectable.idl b/include/inspectable.idl new file mode 100644 index 0000000..847d21d --- /dev/null +++ b/include/inspectable.idl @@ -0,0 +1,41 @@ +/* + * Copyright 2015 Jacek Caban 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 + */ + +import "wtypes.idl"; +import "unknwn.idl"; +import "hstring.idl"; + +typedef [v1_enum] enum TrustLevel { + BaseTrust, + PartialTrust, + FullTrust +} TrustLevel; + +[ + object, + uuid(af86e2e0-b12d-4c6a-9c5a-d7aa65101e90), + pointer_default(unique) +] +interface IInspectable : IUnknown +{ + HRESULT GetIids([out] ULONG *iidCount, [out, size_is(,*iidCount)] IID **iids); + HRESULT GetRuntimeClassName([out] HSTRING *className); + HRESULT GetTrustLevel([out] TrustLevel *trustLevel); +} + +typedef [unique] IInspectable *LPINSPECTABLE;

1 0

Nikolay Sivov : dwrite: Implement GetRecommendedRenderingMode().
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: e877cfbcfa4759b57048f029c14e12acbb6acafb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e877cfbcfa4759b57048f029c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 27 11:10:32 2015 +0300 dwrite: Implement GetRecommendedRenderingMode(). --- dlls/dwrite/dwrite_private.h | 9 +++ dlls/dwrite/font.c | 134 +++++++++++++++++++++++++++++++++++++++---- dlls/dwrite/opentype.c | 30 +++++++++- dlls/dwrite/tests/font.c | 28 +++++---- 4 files changed, 174 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e877cfbcfa4759b57048f…

1 0

Nikolay Sivov : dwrite/tests: Some tests for GetRecommendedRenderingMode() .
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: aac3a069e4ccf2a5077331927116935e90016231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aac3a069e4ccf2a5077331927… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 27 11:10:04 2015 +0300 dwrite/tests: Some tests for GetRecommendedRenderingMode(). --- dlls/dwrite/tests/font.c | 269 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 269 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aac3a069e4ccf2a507733…

1 0

Michael Stefaniuc : qcap/tests: Add COM tests for VfwCapture.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: 7b1332d3f507328590e43f385a6fe7a12e51ef3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b1332d3f507328590e43f385… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 27 09:33:08 2015 +0200 qcap/tests: Add COM tests for VfwCapture. --- dlls/qcap/tests/qcap.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 83d1339..7fd48ef 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1850,6 +1850,145 @@ static void test_AviCo(void) IBaseFilter_Release(avico); } +/* Outer IUnknown for COM aggregation tests */ +struct unk_impl { + IUnknown IUnknown_iface; + LONG ref; + IUnknown *inner_unk; +}; + +static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); +} + +static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ret_iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return IUnknown_QueryInterface(This->inner_unk, riid, ret_iface); +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl unk_vtbl = +{ + unk_QueryInterface, + unk_AddRef, + unk_Release +}; + +static void test_COM_vfwcapture(void) +{ + struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; + IBaseFilter *bf; + IMediaFilter *mf; + IPersist *p; + IPersistPropertyBag *ppb; + IAMVfwCaptureDialogs *amvcd; + IAMFilterMiscFlags *amfmf; + ISpecifyPropertyPages *spp; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_VfwCapture, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&unk_obj.inner_unk); + ok(hr == S_OK, "VfwCapture create failed: %08x\n", hr); + hr = IUnknown_QueryInterface(unk_obj.inner_unk, &IID_IBaseFilter, (void**)&bf); + ok(hr == S_OK, "QueryInterface for IID_IBaseFilter failed: %08x\n", hr); + refcount = IBaseFilter_AddRef(bf); + ok(refcount == unk_obj.ref, "VfwCapture just pretends to support COM aggregation\n"); + refcount = IBaseFilter_Release(bf); + ok(refcount == unk_obj.ref, "VfwCapture just pretends to support COM aggregation\n"); + refcount = IBaseFilter_Release(bf); + ok(refcount == 19, "Refcount should be back at 19 but is %u\n", refcount); + IUnknown_Release(unk_obj.inner_unk); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_VfwCapture, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, + (void**)&bf); + ok(hr == E_NOINTERFACE, "VfwCapture create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all VfwCapture interfaces */ + hr = CoCreateInstance(&CLSID_VfwCapture, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, + (void**)&bf); + ok(hr == S_OK, "VfwCapture create failed: %08x, expected S_OK\n", hr); + refcount = IBaseFilter_AddRef(bf); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IBaseFilter_QueryInterface(bf, &IID_IMediaFilter, (void**)&mf); + ok(hr == S_OK, "QueryInterface for IID_IMediaFilter failed: %08x\n", hr); + refcount = IMediaFilter_AddRef(mf); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IMediaFilter_Release(mf); + + hr = IBaseFilter_QueryInterface(bf, &IID_IPersist, (void**)&p); + ok(hr == S_OK, "QueryInterface for IID_IPersist failed: %08x\n", hr); + refcount = IPersist_AddRef(p); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IPersist_Release(p); + + hr = IBaseFilter_QueryInterface(bf, &IID_IPersistPropertyBag, (void**)&ppb); + ok(hr == S_OK, "QueryInterface for IID_IPersistPropertyBag failed: %08x\n", hr); + refcount = IPersistPropertyBag_AddRef(ppb); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IPersistPropertyBag_Release(ppb); + + hr = IBaseFilter_QueryInterface(bf, &IID_IAMVfwCaptureDialogs, (void**)&amvcd); + todo_wine ok(hr == S_OK, "QueryInterface for IID_IAMVfwCaptureDialogs failed: %08x\n", hr); + if (hr == S_OK) { + refcount = IAMVfwCaptureDialogs_AddRef(amvcd); + ok(refcount == 7, "refcount == %u, expected 7\n", refcount); + refcount = IAMVfwCaptureDialogs_Release(amvcd); + } + + hr = IBaseFilter_QueryInterface(bf, &IID_IAMFilterMiscFlags, (void**)&amfmf); + todo_wine ok(hr == S_OK, "QueryInterface for IID_IAMFilterMiscFlags failed: %08x\n", hr); + if (hr == S_OK) { + refcount = IAMFilterMiscFlags_AddRef(amfmf); + ok(refcount == 8, "refcount == %u, expected 8\n", refcount); + refcount = IAMFilterMiscFlags_Release(amfmf); + } + + hr = IBaseFilter_QueryInterface(bf, &IID_ISpecifyPropertyPages, (void**)&spp); + todo_wine ok(hr == S_OK, "QueryInterface for IID_ISpecifyPropertyPages failed: %08x\n", hr); + if (hr == S_OK) { + refcount = ISpecifyPropertyPages_AddRef(spp); + ok(refcount == 9, "refcount == %u, expected 9\n", refcount); + refcount = ISpecifyPropertyPages_Release(spp); + } + + hr = IBaseFilter_QueryInterface(bf, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + todo_wine ok(refcount == 10, "refcount == %u, expected 10\n", refcount); + refcount = IUnknown_Release(unk); + + /* Unsupported interfaces */ + hr = IBaseFilter_QueryInterface(bf, &IID_IAMStreamConfig, (void**)&unk); + todo_wine ok(hr == E_NOINTERFACE, "QueryInterface for IID_IAMStreamConfig failed: %08x\n", hr); + hr = IBaseFilter_QueryInterface(bf, &IID_IAMVideoProcAmp, (void**)&unk); + todo_wine ok(hr == E_NOINTERFACE, "QueryInterface for IID_IAMVideoProcAmp failed: %08x\n", hr); + hr = IBaseFilter_QueryInterface(bf, &IID_IOverlayNotify, (void**)&unk); + ok(hr == E_NOINTERFACE, "QueryInterface for IID_IOverlayNotify failed: %08x\n", hr); + + while (IBaseFilter_Release(bf)); +} + START_TEST(qcap) { if (SUCCEEDED(CoInitialize(NULL))) @@ -1862,6 +2001,7 @@ START_TEST(qcap) test_AviMux_QueryInterface(); test_AviMux(arg_c>2 ? arg_v[2] : NULL); test_AviCo(); + test_COM_vfwcapture(); CoUninitialize(); }

1 0

Michael Stefaniuc : qcap: Support COM aggregation in VfwCapture.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: 67ced3c372ba34696e17fbb8d6db4c1ac00655b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67ced3c372ba34696e17fbb8d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 28 11:03:23 2015 +0200 qcap: Support COM aggregation in VfwCapture. --- dlls/qcap/vfwcapture.c | 193 ++++++++++++++++++++++++++++++------------------- 1 file changed, 120 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67ced3c372ba34696e17f…

1 0

Michael Stefaniuc : qcap: There can be only ONE QueryInterface in VfwCapture!.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: d3ceabf433d1c2b5528f9594e41471c4076dc6fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3ceabf433d1c2b5528f9594e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 27 09:28:22 2015 +0200 qcap: There can be only ONE QueryInterface in VfwCapture!. --- dlls/qcap/vfwcapture.c | 55 +++++++++----------------------------------------- 1 file changed, 10 insertions(+), 45 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 67cc8f5..4f7508a 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -276,23 +276,12 @@ static const IBaseFilterVtbl VfwCapture_Vtbl = }; /* AMStreamConfig interface, we only need to implement {G,S}etFormat */ -static HRESULT WINAPI -AMStreamConfig_QueryInterface( IAMStreamConfig * iface, REFIID riid, LPVOID * ppv ) +static HRESULT WINAPI AMStreamConfig_QueryInterface(IAMStreamConfig *iface, REFIID riid, + void **ret_iface) { VfwCapture *This = impl_from_IAMStreamConfig(iface); - TRACE("%p --> %s\n", This, debugstr_guid(riid)); - - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IAMStreamConfig)) - { - IAMStreamConfig_AddRef(iface); - *ppv = iface; - return S_OK; - } - - FIXME("No interface for iid %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + return IUnknown_QueryInterface(&This->filter.IBaseFilter_iface, riid, ret_iface); } static ULONG WINAPI AMStreamConfig_AddRef( IAMStreamConfig * iface ) @@ -391,20 +380,12 @@ static const IAMStreamConfigVtbl IAMStreamConfig_VTable = AMStreamConfig_GetStreamCaps }; -static HRESULT WINAPI -AMVideoProcAmp_QueryInterface( IAMVideoProcAmp * iface, REFIID riid, - LPVOID * ppv ) +static HRESULT WINAPI AMVideoProcAmp_QueryInterface(IAMVideoProcAmp *iface, REFIID riid, + void **ret_iface) { - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IAMVideoProcAmp)) - { - *ppv = iface; - IAMVideoProcAmp_AddRef( iface ); - return S_OK; - } + VfwCapture *This = impl_from_IAMVideoProcAmp(iface); - FIXME("No interface for iid %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + return IUnknown_QueryInterface(&This->filter.IBaseFilter_iface, riid, ret_iface); } static ULONG WINAPI AMVideoProcAmp_AddRef(IAMVideoProcAmp * iface) @@ -459,27 +440,11 @@ static const IAMVideoProcAmpVtbl IAMVideoProcAmp_VTable = AMVideoProcAmp_Get, }; -static HRESULT WINAPI -PPB_QueryInterface( IPersistPropertyBag * iface, REFIID riid, LPVOID * ppv ) +static HRESULT WINAPI PPB_QueryInterface(IPersistPropertyBag *iface, REFIID riid, void **ret_iface) { - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IPersist) || - IsEqualIID(riid, &IID_IPersistPropertyBag)) - { - IPersistPropertyBag_AddRef(iface); - *ppv = iface; - return S_OK; - } - if (IsEqualIID(riid, &IID_IBaseFilter)) - { - /* FIXME: native devenum asks for IBaseFilter, should we return it? */ - IPersistPropertyBag_AddRef(iface); - *ppv = iface; - return S_OK; - } + VfwCapture *This = impl_from_IPersistPropertyBag(iface); - FIXME("No interface for iid %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + return IUnknown_QueryInterface(&This->filter.IBaseFilter_iface, riid, ret_iface); } static ULONG WINAPI PPB_AddRef(IPersistPropertyBag * iface)

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
57
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 July 2015