November 2010 - Wine-Commits

Maarten Lankhorst : winegstreamer: Fix buffer leak in error path.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: d62b4dcb664a2a6a8579600c975e8213766746f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62b4dcb664a2a6a8579600c9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 9 23:42:44 2010 +0100 winegstreamer: Fix buffer leak in error path. --- dlls/winegstreamer/gstdemux.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index d26f853..a6f72c4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -517,10 +517,12 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstBuffer *buf) { } else { BYTE *ptr = NULL; hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); - freeSamp = TRUE; - if (hr == VFW_E_NOT_CONNECTED) + if (hr == VFW_E_NOT_CONNECTED) { + gst_buffer_unref(buf); return GST_FLOW_NOT_LINKED; + } if (FAILED(hr)) { + gst_buffer_unref(buf); ERR("Didn't get a GST_APP_BUFFER, and could not get a delivery buffer (%x), returning GST_FLOW_WRONG_STATE\n", hr); return GST_FLOW_WRONG_STATE; }

1 0

Maarten Lankhorst : winegstreamer: Add QOS to transformer filters.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 9ce718d0e9ae5afc9e0a6646dff63b6f6f6e49e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce718d0e9ae5afc9e0a6646d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 9 23:42:46 2010 +0100 winegstreamer: Add QOS to transformer filters. --- dlls/winegstreamer/gsttffilter.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index e84ade7..f56cc40 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -433,6 +433,12 @@ static HRESULT WINAPI Gstreamer_transform_NewSegment(TransformFilter *iface, REF return S_OK; } +static HRESULT WINAPI Gstreamer_transform_QOS(TransformFilter *iface, IBaseFilter *sender, Quality qm) { + GstTfImpl *This = (GstTfImpl*)iface; + gst_pad_push_event(This->my_sink, gst_event_new_qos(1000. / qm.Proportion, qm.Late * 100, qm.TimeStamp * 100)); + return QualityControlImpl_Notify((IQualityControl*)&iface->qcimpl, sender, qm); +} + static HRESULT Gstreamer_transform_create(IUnknown *punkout, const CLSID *clsid, const char *name, const TransformFilterFuncTable *vtbl, void **obj) { GstTfImpl *This; @@ -556,7 +562,8 @@ static const TransformFilterFuncTable Gstreamer_Mp3_vtbl = { Gstreamer_transform_EndOfStream, Gstreamer_transform_BeginFlush, Gstreamer_transform_EndFlush, - Gstreamer_transform_NewSegment + Gstreamer_transform_NewSegment, + Gstreamer_transform_QOS }; IUnknown * CALLBACK Gstreamer_Mp3_create(IUnknown *punkout, HRESULT *phr) @@ -687,7 +694,8 @@ static const TransformFilterFuncTable Gstreamer_YUV_vtbl = { Gstreamer_transform_EndOfStream, Gstreamer_transform_BeginFlush, Gstreamer_transform_EndFlush, - Gstreamer_transform_NewSegment + Gstreamer_transform_NewSegment, + Gstreamer_transform_QOS }; IUnknown * CALLBACK Gstreamer_YUV_create(IUnknown *punkout, HRESULT *phr) @@ -800,7 +808,8 @@ static const TransformFilterFuncTable Gstreamer_AudioConvert_vtbl = { Gstreamer_transform_EndOfStream, Gstreamer_transform_BeginFlush, Gstreamer_transform_EndFlush, - Gstreamer_transform_NewSegment + Gstreamer_transform_NewSegment, + Gstreamer_transform_QOS }; IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *punkout, HRESULT *phr)

1 0

Alexandre Julliard : msxml6: Add a typelib resource.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 62c37253e62ca10bb6a57bdec58cbb5f768c39e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62c37253e62ca10bb6a57bdec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 9 23:10:23 2010 +0100 msxml6: Add a typelib resource. --- .gitignore | 1 + dlls/msxml6/Makefile.in | 4 +++- dlls/msxml6/msxml6_tlb.idl | 19 +++++++++++++++++++ dlls/msxml6/regsvr.c | 10 ++++++++++ dlls/msxml6/rsrc.rc | 3 +++ 5 files changed, 36 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index d1090c1..c15e617 100644 --- a/.gitignore +++ b/.gitignore @@ -95,6 +95,7 @@ dlls/msxml3/msxml3_v1.tlb dlls/msxml3/xslpattern.tab.c dlls/msxml3/xslpattern.tab.h dlls/msxml3/xslpattern.yy.c +dlls/msxml6/msxml6_tlb.tlb dlls/ole32/dcom.h dlls/ole32/dcom_p.c dlls/ole32/irot.h diff --git a/dlls/msxml6/Makefile.in b/dlls/msxml6/Makefile.in index 23e1d1f..377b477 100644 --- a/dlls/msxml6/Makefile.in +++ b/dlls/msxml6/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DCOM_NO_WINDOWS_H MODULE = msxml6.dll -IMPORTS = ole32 advapi32 +IMPORTS = oleaut32 ole32 advapi32 C_SRCS = \ main.c \ @@ -8,4 +8,6 @@ C_SRCS = \ RC_SRCS = rsrc.rc +IDL_TLB_SRCS = msxml6_tlb.idl + @MAKE_DLL_RULES@ diff --git a/dlls/msxml6/msxml6_tlb.idl b/dlls/msxml6/msxml6_tlb.idl new file mode 100644 index 0000000..1a2ddbd --- /dev/null +++ b/dlls/msxml6/msxml6_tlb.idl @@ -0,0 +1,19 @@ +/* + * Copyright 2010 Alexandre Julliard + * + * 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 + */ + +#include "msxml6.idl" diff --git a/dlls/msxml6/regsvr.c b/dlls/msxml6/regsvr.c index af303e8..2cf08be 100644 --- a/dlls/msxml6/regsvr.c +++ b/dlls/msxml6/regsvr.c @@ -438,6 +438,7 @@ static struct progid const progid_list[] = { */ HRESULT WINAPI DllRegisterServer(void) { + static const WCHAR msxml6W[] = {'m','s','x','m','l','6','.','d','l','l',0}; HRESULT hr; TRACE("\n"); @@ -446,6 +447,13 @@ HRESULT WINAPI DllRegisterServer(void) if (SUCCEEDED(hr)) hr = register_progids(progid_list); + if (SUCCEEDED(hr)) + { + ITypeLib *tl; + hr = LoadTypeLibEx( msxml6W, REGKIND_REGISTER, &tl ); + if (SUCCEEDED(hr)) ITypeLib_Release( tl ); + } + return hr; } @@ -461,6 +469,8 @@ HRESULT WINAPI DllUnregisterServer(void) hr = unregister_coclasses(coclass_list); if (SUCCEEDED(hr)) hr = unregister_progids(progid_list); + if (SUCCEEDED(hr)) + hr = UnRegisterTypeLib( &LIBID_MSXML2, 6, 0, LOCALE_SYSTEM_DEFAULT, SYS_WIN32 ); return hr; } diff --git a/dlls/msxml6/rsrc.rc b/dlls/msxml6/rsrc.rc index 766ea21..ccead7e 100644 --- a/dlls/msxml6/rsrc.rc +++ b/dlls/msxml6/rsrc.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: msxml6_tlb.tlb */ +1 TYPELIB msxml6_tlb.tlb + #define WINE_OLESELFREGISTER #define WINE_FILEDESCRIPTION_STR "Wine MSXML 6.0" #define WINE_FILENAME_STR "msxml6.dll"

1 0

Alexandre Julliard : msxml6: Add a version resource.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: d344e9a26139d64bcba29ab2ff5bc7d3955d7df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d344e9a26139d64bcba29ab2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 9 23:08:17 2010 +0100 msxml6: Add a version resource. --- dlls/msxml6/Makefile.in | 2 ++ dlls/msxml6/rsrc.rc | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/msxml6/Makefile.in b/dlls/msxml6/Makefile.in index 5627500..23e1d1f 100644 --- a/dlls/msxml6/Makefile.in +++ b/dlls/msxml6/Makefile.in @@ -6,4 +6,6 @@ C_SRCS = \ main.c \ regsvr.c +RC_SRCS = rsrc.rc + @MAKE_DLL_RULES@ diff --git a/dlls/msxml6/rsrc.rc b/dlls/msxml6/rsrc.rc new file mode 100644 index 0000000..766ea21 --- /dev/null +++ b/dlls/msxml6/rsrc.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2010 Alexandre Julliard + * + * 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 + */ + +#define WINE_OLESELFREGISTER +#define WINE_FILEDESCRIPTION_STR "Wine MSXML 6.0" +#define WINE_FILENAME_STR "msxml6.dll" +#define WINE_FILEVERSION 6,10,1129,0 +#define WINE_FILEVERSION_STR "6.10.1129.0" +#define WINE_PRODUCTVERSION 6,10,1129,0 +#define WINE_PRODUCTVERSION_STR "6.10.1129.0" + +#include "wine/wine_common_ver.rc"

1 0

Alexandre Julliard : include: Define a few more msxml interfaces and classes.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 19939ee532c1c9f364832543465243951794d491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19939ee532c1c9f3648325434… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 10 11:33:25 2010 +0100 include: Define a few more msxml interfaces and classes. --- include/msxml2.idl | 475 ++++++++++++++++++++++++++++++++++++++++++++++++++- include/msxml2did.h | 23 +++ 2 files changed, 495 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19939ee532c1c9f364832…

1 0

Maarten Lankhorst : strmbase: Silence harmless fixme.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 8363436ea851a2b3676245df7c01e0388a2dba84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8363436ea851a2b3676245df7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 9 23:42:38 2010 +0100 strmbase: Silence harmless fixme. --- dlls/strmbase/transform.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 029d289..cfde074 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -250,7 +250,8 @@ HRESULT WINAPI TransformFilterImpl_QueryInterface(IBaseFilter * iface, REFIID ri } hr = BaseFilterImpl_QueryInterface(iface, riid, ppv); - if (FAILED(hr) && (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow))) + if (FAILED(hr) && !IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow) && + !IsEqualIID(riid, &IID_IAMFilterMiscFlags)) FIXME("No interface for %s!\n", debugstr_guid(riid)); return hr;

1 0

Andrew Eikum : oleaut32: Search inherited interfaces again in ITypeComp:: Bind.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: c0f120db5d6b72917dd9bb1e4630f2b6ff6960a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f120db5d6b72917dd9bb1e4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 9 16:04:10 2010 -0600 oleaut32: Search inherited interfaces again in ITypeComp::Bind. --- dlls/oleaut32/tests/typelib.c | 14 ++++++++++++++ dlls/oleaut32/typelib.c | 4 +++- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 016dbd0..ce40cb9 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -121,6 +121,7 @@ static void test_TypeComp(void) static WCHAR wszClone[] = {'C','l','o','n','e',0}; static WCHAR wszclone[] = {'c','l','o','n','e',0}; static WCHAR wszJunk[] = {'J','u','n','k',0}; + static WCHAR wszAddRef[] = {'A','d','d','R','e','f',0}; hr = LoadTypeLib(wszStdOle2, &pTypeLib); ok_ole_success(hr, LoadTypeLib); @@ -307,6 +308,19 @@ static void test_TypeComp(void) ok(pTypeInfo == NULL, "pTypeInfo should have been NULL, was: %p\n", pTypeInfo); ok(bindptr.lptcomp == NULL, "bindptr should have been NULL, was: %p\n", bindptr.lptcomp); + /* tests inherited members */ + desckind = 0xdeadbeef; + bindptr.lpfuncdesc = NULL; + pTypeInfo = NULL; + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszAddRef); + hr = ITypeComp_Bind(pTypeComp, wszAddRef, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + ok(desckind == DESCKIND_FUNCDESC, "desckind should have been DESCKIND_FUNCDESC, was: %d\n", desckind); + ok(pTypeInfo != NULL, "pTypeInfo should not have been NULL, was: %p\n", pTypeInfo); + ok(bindptr.lpfuncdesc != NULL, "bindptr should not have been NULL, was: %p\n", bindptr.lpfuncdesc); + ITypeInfo_ReleaseFuncDesc(pTypeInfo, bindptr.lpfuncdesc); + ITypeInfo_Release(pTypeInfo); + ITypeComp_Release(pTypeComp); ITypeInfo_Release(pFontTypeInfo); ITypeLib_Release(pTypeLib); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0fb3cee..06c464d 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7846,7 +7846,7 @@ static HRESULT WINAPI ITypeComp_fnBind( ITypeInfoImpl *This = info_impl_from_ITypeComp(iface); const TLBFuncDesc *pFDesc; const TLBVarDesc *pVDesc; - HRESULT hr = S_OK; + HRESULT hr = DISP_E_MEMBERNOTFOUND; TRACE("(%p)->(%s, %x, 0x%x, %p, %p, %p)\n", This, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); @@ -7908,6 +7908,8 @@ static HRESULT WINAPI ITypeComp_fnBind( } WARN("Could not search inherited interface!\n"); } + if (hr == DISP_E_MEMBERNOTFOUND) + hr = S_OK; TRACE("did not find member with name %s, flags 0x%x\n", debugstr_w(szName), wFlags); return hr; }

1 0

Maarten Lankhorst : quartz: Use media time instead of stream time in video renderer.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: adabc4ae92af650e0969f553267e6b6c74b895ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=adabc4ae92af650e0969f5532… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 9 23:42:39 2010 +0100 quartz: Use media time instead of stream time in video renderer. --- dlls/quartz/videorenderer.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index e135fb9..871b71d 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -380,11 +380,12 @@ static HRESULT WINAPI VideoRenderer_Receive(BaseInputPin* pin, IMediaSample * pS return VFW_E_WRONG_STATE; } + if (IMediaSample_GetMediaTime(pSample, &tStart, &tStop) == S_OK) + MediaSeekingPassThru_RegisterMediaTime(This->seekthru_unk, tStart); + hr = IMediaSample_GetTime(pSample, &tStart, &tStop); if (FAILED(hr)) ERR("Cannot get sample time (%x)\n", hr); - else - MediaSeekingPassThru_RegisterMediaTime(This->seekthru_unk, tStart); if (This->rtLastStop != tStart && This->filter.state == State_Running) {

1 0

Maarten Lankhorst : quartz: Fix video renderer EndOfStream.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: a5798fc96caa6610ffcceaae3584ea5b67b758ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5798fc96caa6610ffcceaae3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 9 23:42:41 2010 +0100 quartz: Fix video renderer EndOfStream. --- dlls/quartz/videorenderer.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 9645d83..2ad75c4 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -939,11 +939,14 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndOfStream(IPin * iface) BaseInputPin* This = (BaseInputPin*)iface; VideoRendererImpl *pFilter; IMediaEventSink* pEventSink; - HRESULT hr; + HRESULT hr = S_OK; TRACE("(%p/%p)->()\n", This, iface); + EnterCriticalSection(This->pin.pCritSec); pFilter = (VideoRendererImpl*)This->pin.pinInfo.pFilter; + if (This->flushing || This->end_of_stream) + goto out; hr = IFilterGraph_QueryInterface(pFilter->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); if (SUCCEEDED(hr)) { @@ -951,6 +954,9 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndOfStream(IPin * iface) IMediaEventSink_Release(pEventSink); } MediaSeekingPassThru_EOS(pFilter->seekthru_unk); + This->end_of_stream = 1; +out: + LeaveCriticalSection(This->pin.pCritSec); return hr; }

1 0

Maarten Lankhorst : quartz: On flushing, always signal blocked event handle .
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: bb8ccbd507972b08c28449dc33cb51f538c17e42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8ccbd507972b08c28449dc3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 9 23:42:40 2010 +0100 quartz: On flushing, always signal blocked event handle. --- dlls/quartz/videorenderer.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 871b71d..9645d83 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -959,18 +959,11 @@ static HRESULT WINAPI VideoRenderer_InputPin_BeginFlush(IPin * iface) { BaseInputPin* This = (BaseInputPin*)iface; VideoRendererImpl *pVideoRenderer = (VideoRendererImpl *)This->pin.pinInfo.pFilter; - HRESULT hr; TRACE("(%p/%p)->()\n", This, iface); - EnterCriticalSection(This->pin.pCritSec); - if (pVideoRenderer->filter.state == State_Paused) - SetEvent(pVideoRenderer->blocked); - - hr = BaseInputPinImpl_BeginFlush(iface); - LeaveCriticalSection(This->pin.pCritSec); - - return hr; + SetEvent(pVideoRenderer->blocked); + return BaseInputPinImpl_BeginFlush(iface); } static HRESULT WINAPI VideoRenderer_InputPin_EndFlush(IPin * iface)

1 0