July 2014 - Wine-commits - list.winehq.org

Thomas Faber : wineqtdecoder: Destroy BaseFilter after QT child class.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: c6dfc084a535349676941ed46ac06c2004c01202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6dfc084a535349676941ed46… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 19 10:41:54 2014 +0200 wineqtdecoder: Destroy BaseFilter after QT child class. --- dlls/wineqtdecoder/qtsplitter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 35dc807..8bb51a4 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -343,6 +343,7 @@ static void QT_Destroy(QTSplitter *This) This->csReceive.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csReceive); + BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); } @@ -381,7 +382,7 @@ static HRESULT WINAPI QT_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID static ULONG WINAPI QT_Release(IBaseFilter *iface) { QTSplitter *This = impl_from_IBaseFilter(iface); - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1);

1 0

Thomas Faber : quartz: Destroy BaseFilter after child class.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: 5ce8c7a5a794cc86297fda637596140e9bb10e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce8c7a5a794cc86297fda637… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 19 10:29:54 2014 +0200 quartz: Destroy BaseFilter after child class. --- dlls/quartz/filesource.c | 3 ++- dlls/quartz/nullrenderer.c | 3 ++- dlls/quartz/parser.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a0af3a4..96d83a1 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -480,7 +480,7 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) { AsyncReader *This = impl_from_IBaseFilter(iface); - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1); @@ -500,6 +500,7 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) CoTaskMemFree(This->pszFileName); if (This->pmt) FreeMediaType(This->pmt); + BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); return 0; } diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index 16a24ac..7befc46 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -128,11 +128,12 @@ static ULONG WINAPI NullRendererInner_AddRef(IUnknown *iface) static ULONG WINAPI NullRendererInner_Release(IUnknown *iface) { NullRendererImpl *This = impl_from_IUnknown(iface); - ULONG refCount = BaseFilterImpl_Release(&This->renderer.filter.IBaseFilter_iface); + ULONG refCount = InterlockedDecrement(&This->renderer.filter.refCount); if (!refCount) { TRACE("Destroying Null Renderer\n"); + BaseFilter_Destroy(&This->renderer.filter); CoTaskMemFree(This); } diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index f702c62..b57bae4 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -194,6 +194,7 @@ void Parser_Destroy(ParserImpl *This) } CoTaskMemFree(This->ppPins); + BaseFilter_Destroy(&This->filter); TRACE("Destroying parser\n"); CoTaskMemFree(This); @@ -202,7 +203,7 @@ void Parser_Destroy(ParserImpl *This) ULONG WINAPI Parser_Release(IBaseFilter * iface) { ParserImpl *This = impl_from_IBaseFilter(iface); - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1);

1 0

Marcus Meissner : d3dx9_36: Fixed typo in HeapAlloc return checking ( Coverity).
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: 20ef8d29911fdd6f63bdc95ff67482da2b0f9084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ef8d29911fdd6f63bdc95ff… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jul 22 08:24:55 2014 +0200 d3dx9_36: Fixed typo in HeapAlloc return checking (Coverity). --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 4d11618..17c5d9c 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -3687,7 +3687,7 @@ static BOOL compute_text_mesh(struct mesh *mesh, HDC hdc, const char *text, } HeapFree(GetProcessHeap(), 0, raw_outline); raw_outline = HeapAlloc(GetProcessHeap(), 0, datasize); - if (!glyphs) { + if (!raw_outline) { hr = E_OUTOFMEMORY; goto error; }

1 0

Henri Verbeet : dxgi: Implement dxgi_surface_GetDesc().
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: d17bd8d82136853867de39988dc9342d7afd5945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17bd8d82136853867de39988… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 22 08:44:20 2014 +0200 dxgi: Implement dxgi_surface_GetDesc(). --- dlls/d3d10core/texture.c | 8 +++++++- dlls/dxgi/device.c | 3 +-- dlls/dxgi/dxgi_private.h | 5 ++++- dlls/dxgi/surface.c | 12 +++++++++--- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index f169190..80ac899 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -253,6 +253,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic if (desc->MipLevels == 1 && desc->ArraySize == 1) { + DXGI_SURFACE_DESC surface_desc; IWineDXGIDevice *wine_device; if (FAILED(hr = ID3D10Device1_QueryInterface(&device->ID3D10Device1_iface, &IID_IWineDXGIDevice, @@ -262,7 +263,12 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic return E_FAIL; } - hr = IWineDXGIDevice_create_surface(wine_device, NULL, 0, NULL, + surface_desc.Width = desc->Width; + surface_desc.Height = desc->Height; + surface_desc.Format = desc->Format; + surface_desc.SampleDesc = desc->SampleDesc; + + hr = IWineDXGIDevice_create_surface(wine_device, &surface_desc, 0, NULL, (IUnknown *)&texture->ID3D10Texture2D_iface, (void **)&texture->dxgi_surface); IWineDXGIDevice_Release(wine_device); if (FAILED(hr)) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index e98a2c0..837c57f 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -276,8 +276,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa return E_OUTOFMEMORY; } - hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer); - if (FAILED(hr)) + if (FAILED(hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer, desc))) { WARN("Failed to initialize surface, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 24d9a26..75126cf 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -142,8 +142,11 @@ struct dxgi_surface IUnknown *outer_unknown; LONG refcount; IDXGIDevice *device; + + DXGI_SURFACE_DESC desc; }; -HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer) DECLSPEC_HIDDEN; +HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, + IUnknown *outer, const DXGI_SURFACE_DESC *desc) DECLSPEC_HIDDEN; #endif /* __WINE_DXGI_PRIVATE_H */ diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 2814742..10daff7 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -154,9 +154,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDevice(IDXGISurface *iface, REF /* IDXGISurface methods */ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDesc(IDXGISurface *iface, DXGI_SURFACE_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct dxgi_surface *surface = impl_from_IDXGISurface(iface); - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = surface->desc; + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_surface_Map(IDXGISurface *iface, DXGI_MAPPED_RECT *mapped_rect, UINT flags) @@ -200,13 +204,15 @@ static const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = dxgi_surface_inner_Release, }; -HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer) +HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, + IUnknown *outer, const DXGI_SURFACE_DESC *desc) { surface->IDXGISurface_iface.lpVtbl = &dxgi_surface_vtbl; surface->IUnknown_iface.lpVtbl = &dxgi_surface_inner_unknown_vtbl; surface->refcount = 1; surface->outer_unknown = outer ? outer : &surface->IUnknown_iface; surface->device = device; + surface->desc = *desc; return S_OK; }

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_GetTransform().
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: 952b2575fd5b3b2693a4956b769008eb737ad379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=952b2575fd5b3b2693a4956b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 22 08:44:21 2014 +0200 d2d1: Implement d2d_d3d_render_target_GetTransform(). --- dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/render_target.c | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 720a96d..001c986 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -28,6 +28,8 @@ struct d2d_d3d_render_target { ID2D1RenderTarget ID2D1RenderTarget_iface; LONG refcount; + + D2D1_MATRIX_3X2_F transform; }; void d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 34ed063..0dc633b 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -322,7 +322,11 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTransform(ID2D1RenderTarg static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTransform(ID2D1RenderTarget *iface, D2D1_MATRIX_3X2_F *transform) { - FIXME("iface %p, transform %p stub!\n", iface, transform); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, transform %p.\n", iface, transform); + + *transform = render_target->transform; } static void STDMETHODCALLTYPE d2d_d3d_render_target_SetAntialiasMode(ID2D1RenderTarget *iface, @@ -556,8 +560,17 @@ static const struct ID2D1RenderTargetVtbl d2d_d3d_render_target_vtbl = void d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) { + static const D2D1_MATRIX_3X2_F identity = + { + 1.0f, 0.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + }; + FIXME("Ignoring render target properties.\n"); render_target->ID2D1RenderTarget_iface.lpVtbl = &d2d_d3d_render_target_vtbl; render_target->refcount = 1; + + render_target->transform = identity; }

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_SetTransform().
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: 7976da345ade2bd76591ea0fb1232ce3bd70ab8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7976da345ade2bd76591ea0fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 22 08:44:22 2014 +0200 d2d1: Implement d2d_d3d_render_target_SetTransform(). --- dlls/d2d1/render_target.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 0dc633b..a7a822d 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -316,7 +316,11 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarg static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTransform(ID2D1RenderTarget *iface, const D2D1_MATRIX_3X2_F *transform) { - FIXME("iface %p, transform %p stub!\n", iface, transform); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, transform %p.\n", iface, transform); + + render_target->transform = *transform; } static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTransform(ID2D1RenderTarget *iface,

1 0

Henri Verbeet : dxgi: Only use a single newline in the dxgi_factory_MakeWindowAssociation() FIXME.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: d3c6d3425f60f1270661feb06f02f6d7587b778d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c6d3425f60f1270661feb06… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 22 08:44:23 2014 +0200 dxgi: Only use a single newline in the dxgi_factory_MakeWindowAssociation() FIXME. --- dlls/dxgi/factory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 98d036e..b75802b 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -161,7 +161,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IWineDXGIFactory *ifa static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IWineDXGIFactory *iface, HWND window, UINT flags) { - FIXME("iface %p, window %p, flags %#x stub!\n\n", iface, window, flags); + FIXME("iface %p, window %p, flags %#x stub!\n", iface, window, flags); return E_NOTIMPL; }

1 0

Henri Verbeet : wined3d: Avoid a compiler warning in context_stream_info_from_declaration().
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: 96d845aa468bf09f32c03fbee584201df52a3fef URL: http://source.winehq.org/git/wine.git/?a=commit;h=96d845aa468bf09f32c03fbee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 22 08:44:24 2014 +0200 wined3d: Avoid a compiler warning in context_stream_info_from_declaration(). --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 622cca1..70b9b31 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2794,7 +2794,7 @@ void context_stream_info_from_declaration(struct wined3d_context *context, stream_info->elements[idx].format = element->format; stream_info->elements[idx].data.buffer_object = 0; - stream_info->elements[idx].data.addr = (BYTE *)stream->offset + element->offset; + stream_info->elements[idx].data.addr = (BYTE *)NULL + stream->offset + element->offset; stream_info->elements[idx].stride = stream->stride; stream_info->elements[idx].stream_idx = element->input_slot;

1 0

Marcus Meissner : secur32: Removed superflous NULL check (Coverity).
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: 877f1a759e9c9ef92e808dc85445c5299e1074fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=877f1a759e9c9ef92e808dc85… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jul 22 09:02:32 2014 +0200 secur32: Removed superflous NULL check (Coverity). --- dlls/secur32/ntlm.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 5914fbc..0fe64ed 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1171,12 +1171,6 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( goto asc_end; } - if(!phContext) - { - ret = SEC_E_INVALID_HANDLE; - goto asc_end; - } - helper = (PNegoHelper)phContext->dwLower; if(helper->mode != NTLM_SERVER)

1 0

Andrei Slăvoiu : wined3d: Remove usage of gl_info parameter from select_card_amd_binary.
by Alexandre Julliard 21 Jul '14

21 Jul '14

Module: wine Branch: master Commit: 22475ddd82b09bbd25a9eba046583e1febc5c630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22475ddd82b09bbd25a9eba04… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Sun Jul 20 19:41:13 2014 +0300 wined3d: Remove usage of gl_info parameter from select_card_amd_binary. --- dlls/wined3d/directx.c | 222 ++++++++++++++++++++++++------------------------- 1 file changed, 107 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22475ddd82b09bbd25a9e…

1 0