January 2012 - Wine-commits

Michael Stefaniuc : dsound: Merge IKsPropertySet into the secondary buffer object.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: 48ca5924b4d4931402533dc66649534a9865372e URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ca5924b4d4931402533dc66… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 17 01:53:10 2012 +0100 dsound: Merge IKsPropertySet into the secondary buffer object. --- dlls/dsound/buffer.c | 104 +++++++++++++---------------------------- dlls/dsound/dsound_private.h | 25 +--------- 2 files changed, 36 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48ca5924b4d4931402533…

1 0

Michael Stefaniuc : dsound: Support IKsPropertySet in the primary buffer too.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: 3ec0b056d58109bd732f887d05adcceec87be376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ec0b056d58109bd732f887d0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 17 01:54:53 2012 +0100 dsound: Support IKsPropertySet in the primary buffer too. --- dlls/dsound/buffer.c | 8 ++++++-- dlls/dsound/primary.c | 7 +++++-- dlls/dsound/tests/ds3d.c | 31 +++++++++++++------------------ 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index a1546aa..690d104 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1159,8 +1159,12 @@ static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface) TRACE("(%p) ref was %d\n", This, ref + 1); - if (!ref && !InterlockedDecrement(&This->numIfaces)) - secondarybuffer_destroy(This); + if (!ref && !InterlockedDecrement(&This->numIfaces)) { + if (is_primary_buffer(This)) + primarybuffer_destroy(This); + else + secondarybuffer_destroy(This); + } return ref; } diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 9363a31..5c74353 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -1165,8 +1165,9 @@ static HRESULT WINAPI PrimaryBufferImpl_QueryInterface(IDirectSoundBuffer *iface } if ( IsEqualGUID( &IID_IKsPropertySet, riid ) ) { - FIXME("app requested IKsPropertySet on primary buffer\n"); - return E_NOINTERFACE; + *ppobj = &This->IKsPropertySet_iface; + IKsPropertySet_AddRef(&This->IKsPropertySet_iface); + return S_OK; } FIXME( "Unknown IID %s\n", debugstr_guid( riid ) ); @@ -1220,10 +1221,12 @@ HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl * dsb->ref = 0; dsb->ref3D = 0; + dsb->refiks = 0; dsb->numIfaces = 0; dsb->device = device; dsb->IDirectSoundBuffer8_iface.lpVtbl = (IDirectSoundBuffer8Vtbl *)&dspbvt; dsb->IDirectSound3DListener_iface.lpVtbl = &ds3dlvt; + dsb->IKsPropertySet_iface.lpVtbl = &iksbvt; dsb->dsbd = *dsbd; /* IDirectSound3DListener */ diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 3e56c8a..0fbbfe8 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1213,15 +1213,13 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) !(dscaps.dwFlags & DSCAPS_EMULDRIVER),1.0,0, listener,0,0,FALSE,0); - todo_wine { - temp_buffer = NULL; - rc=IDirectSound3DListener_QueryInterface(listener, - &IID_IKsPropertySet,(LPVOID *)&temp_buffer); - ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSound3DListener_QueryInterface didn't handle IKsPropertySet: ret = %08x\n", rc); - if(temp_buffer) - IKsPropertySet_Release(temp_buffer); - } + temp_buffer = NULL; + rc = IDirectSound3DListener_QueryInterface(listener, &IID_IKsPropertySet, + (void **)&temp_buffer); + ok(rc==DS_OK && temp_buffer!=NULL, + "IDirectSound3DListener_QueryInterface didn't handle IKsPropertySet: ret = %08x\n", rc); + if(temp_buffer) + IKsPropertySet_Release(temp_buffer); } /* Testing the reference counting */ @@ -1230,15 +1228,12 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) "references, should have 0\n",ref); } - todo_wine { - temp_buffer = NULL; - rc=IDirectSoundBuffer_QueryInterface(primary, - &IID_IKsPropertySet,(LPVOID *)&temp_buffer); - ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSoundBuffer_QueryInterface didn't handle IKsPropertySet on primary buffer: ret = %08x\n", rc); - if(temp_buffer) - IKsPropertySet_Release(temp_buffer); - } + temp_buffer = NULL; + rc = IDirectSoundBuffer_QueryInterface(primary, &IID_IKsPropertySet, (void **)&temp_buffer); + ok(rc==DS_OK && temp_buffer!=NULL, + "IDirectSoundBuffer_QueryInterface didn't handle IKsPropertySet on primary buffer: ret = %08x\n", rc); + if(temp_buffer) + IKsPropertySet_Release(temp_buffer); /* Testing the reference counting */ ref=IDirectSoundBuffer_Release(primary);

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.37
by Jeremy Newman 16 Jan '12

16 Jan '12

Module: website Branch: master Commit: 8de779a9bfaeaa27afa4ef9a64baa98d9dd3d7a7 URL: http://source.winehq.org/git/website.git/?a=commit;h=8de779a9bfaeaa27afa4ef… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Jan 15 13:43:43 2012 +0100 Polish translation for release 1.3.37 --- news/pl/2012011301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2012011301.xml b/news/pl/2012011301.xml new file mode 100644 index 0000000..322dc8a --- /dev/null +++ b/news/pl/2012011301.xml @@ -0,0 +1,17 @@ +<news> +<date>Styczeń 13, 2012</date> +<title>Wydano Wine 1.3.37</title> +<body> + Wydanie rozwojowe Wine 1.3.37 jest już dostępne. + <a href="{$root}/announce/1.3.37">Co nowego</a> w tym wydaniu: +<ul> + <li>Ukończenie silnika DIB.</li> + <li>Ulepszenia do biblioteki uruchomieniowej C++.</li> + <li>Kilka poprawek w sterownikach dźwiękowych.</li> + <li>Usunięto niepotrzebne opcje Direct3D z WineCfg.</li> + <li>Kilka poprawek we wbudowanym Internet Explorer.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.37.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : user32: Fix a pointer cast warning.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 50480c72f32d5c5913ddfb1de1f76f5d23f33398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50480c72f32d5c5913ddfb1de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 16 18:07:09 2012 +0100 user32: Fix a pointer cast warning. --- dlls/user32/input.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 905bda1..6a76cb8 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -943,7 +943,7 @@ UINT WINAPI GetKeyboardLayoutList(INT nBuff, HKL *layouts) rc = RegEnumKeyW(hKeyKeyboard, count, szKeyName, 9); if (rc == ERROR_SUCCESS) { - layout = (HKL)strtoulW(szKeyName,NULL,16); + layout = (HKL)(ULONG_PTR)strtoulW(szKeyName,NULL,16); if (baselayout != 0 && layout == (HKL)baselayout) baselayout = 0; /* found in the registry do not add again */ if (nBuff && layouts)

1 0

Piotr Caban : urlmon: Added Uri IMarshal implementation.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 991061e4619daff0e97253ffa9527339506580f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=991061e4619daff0e97253ffa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 16 15:13:03 2012 +0100 urlmon: Added Uri IMarshal implementation. --- dlls/urlmon/uri.c | 295 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 271 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=991061e4619daff0e9725…

1 0

Piotr Caban : urlmon/tests: Added Uri IMarshal_MarshalInterface tests.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: c6a72ce150519b9e1faadc41e53d8dc4f3111334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a72ce150519b9e1faadc41e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 16 15:13:18 2012 +0100 urlmon/tests: Added Uri IMarshal_MarshalInterface tests. --- dlls/urlmon/tests/uri.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index e570965..4f1db15 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -10691,6 +10691,7 @@ static void test_IPersistStream(void) IUri *uri; IPersistStream *persist_stream; IStream *stream; + IMarshal *marshal; DWORD props, props_no, dw_data[6]; WCHAR str_data[1024]; ULARGE_INTEGER size, max_size; @@ -10821,6 +10822,57 @@ static void test_IPersistStream(void) wine_dbgstr_w(raw_uri)); SysFreeString(raw_uri); + hr = IUri_QueryInterface(uri, &IID_IMarshal, (void**)&marshal); + ok(hr == S_OK, "%d) QueryInterface(IID_IMarshal) failed 0x%08x, expected S_OK.\n", i, hr); + hr = IStream_Seek(stream, no_off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "%d) Seek failed 0x%08x, expected S_OK.\n", i, hr); + hr = IMarshal_MarshalInterface(marshal, stream, &IID_IUri, (void*)uri, + MSHCTX_DIFFERENTMACHINE, NULL, MSHLFLAGS_NORMAL); + ok(hr == E_INVALIDARG, "%d) MarshalInterface returned 0x%08x, expected E_INVALIDARG.\n", i, hr); + hr = IMarshal_MarshalInterface(marshal, stream, &IID_IUri, (void*)uri, + MSHCTX_CROSSCTX, NULL, MSHLFLAGS_NORMAL); + ok(hr == E_INVALIDARG, "%d) MarshalInterface returned 0x%08x, expected E_INVALIDARG.\n", i, hr); + hr = IMarshal_MarshalInterface(marshal, stream, &IID_IUri, (void*)uri, + MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG); + ok(hr == E_INVALIDARG, "%d) MarshalInterface returned 0x%08x, expected E_INVALIDARG.\n", i, hr); + hr = IMarshal_MarshalInterface(marshal, stream, &IID_IUri, (void*)uri, + MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLEWEAK); + ok(hr == E_INVALIDARG, "%d) MarshalInterface returned 0x%08x, expected E_INVALIDARG.\n", i, hr); + hr = IMarshal_MarshalInterface(marshal, stream, &IID_IUri, (void*)uri, + MSHCTX_LOCAL, NULL, MSHLFLAGS_NOPING); + ok(hr == E_INVALIDARG, "%d) MarshalInterface returned 0x%08x, expected E_INVALIDARG.\n", i, hr); + hr = IMarshal_MarshalInterface(marshal, stream, &IID_IUri, (void*)uri, + MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL); + ok(hr == S_OK, "%d) MarshalInterface failed 0x%08x, expected S_OK.\n", i, hr); + hr = IMarshal_GetUnmarshalClass(marshal, &IID_IUri, (void*)uri, + MSHCTX_CROSSCTX, NULL, MSHLFLAGS_NORMAL, &curi); + ok(hr == E_INVALIDARG, "%d) GetUnmarshalClass returned 0x%08x, expected E_INVALIDARG.\n", i, hr); + hr = IMarshal_GetUnmarshalClass(marshal, &IID_IUri, (void*)uri, + MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL, &curi); + ok(hr == S_OK, "%d) GetUnmarshalClass failed 0x%08x, expected S_OK.\n", i, hr); + ok(IsEqualCLSID(&curi, &CLSID_CUri), "%d) GetUnmarshalClass returned incorrect CLSID.\n", i); + + hr = IStream_Seek(stream, no_off, STREAM_SEEK_CUR, &size); + ok(hr == S_OK, "%d) Seek failed 0x%08x, expected S_OK.\n", i, hr); + hr = IStream_Seek(stream, no_off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "%d) Seek failed 0x%08x, expected S_OK.\n", i, hr); + hr = IStream_Read(stream, (void*)dw_data, 3*sizeof(DWORD), NULL); + ok(hr == S_OK, "%d) Read failed 0x%08x, expected S_OK.\n", i, hr); + ok(dw_data[0]-2 == U(size).LowPart, "%d) Structure size is %d, expected %d\n", + i, dw_data[0]-2, U(size).LowPart); + ok(dw_data[1] == MSHCTX_LOCAL, "%d) Incorrect value %d, expected MSHCTX_LOCAL.\n", + i, dw_data[1]); + ok(dw_data[2] == dw_data[0]-8, "%d) Incorrect value %d, expected %d (PersistStream size).\n", + i, dw_data[2], dw_data[0]-8); + if(!test->str_props[Uri_PROPERTY_PATH].value[0] && + (test->dword_props[Uri_PROPERTY_SCHEME-Uri_PROPERTY_DWORD_START].value == URL_SCHEME_HTTP + || test->dword_props[Uri_PROPERTY_SCHEME-Uri_PROPERTY_DWORD_START].value == URL_SCHEME_FTP + || test->dword_props[Uri_PROPERTY_SCHEME-Uri_PROPERTY_DWORD_START].value == URL_SCHEME_HTTPS)) + U(max_size).LowPart += 3*sizeof(DWORD); + ok(dw_data[2] == U(max_size).LowPart, "%d) Incorrect value %d, expected %d (PersistStream size).\n", + i, dw_data[2], U(max_size).LowPart); + + IMarshal_Release(marshal); IStream_Release(stream); IPersistStream_Release(persist_stream); IUri_Release(uri);

1 0

Piotr Caban : urlmon/tests: Added Uri IMarshal_UnmarshalInterface tests.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: c1fb15d1f8dab0d9ec2233ab8683c71ef4a96ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1fb15d1f8dab0d9ec2233ab8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 16 15:13:32 2012 +0100 urlmon/tests: Added Uri IMarshal_UnmarshalInterface tests. --- dlls/urlmon/tests/uri.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 4f1db15..9a27e59 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -10871,6 +10871,26 @@ static void test_IPersistStream(void) U(max_size).LowPart += 3*sizeof(DWORD); ok(dw_data[2] == U(max_size).LowPart, "%d) Incorrect value %d, expected %d (PersistStream size).\n", i, dw_data[2], U(max_size).LowPart); + IMarshal_Release(marshal); + IUri_Release(uri); + + hr = IStream_Seek(stream, no_off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "%d) Seek failed 0x%08x, expected S_OK.\n", i, hr); + hr = CoCreateInstance(&curi, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IUri, (void**)&uri); + ok(hr == S_OK, "%d) Error creating uninitialized Uri: 0x%08x.\n", i, hr); + hr = IUri_QueryInterface(uri, &IID_IMarshal, (void**)&marshal); + ok(hr == S_OK, "%d) QueryInterface failed 0x%08x, expected S_OK.\n", i, hr); + hr = IMarshal_UnmarshalInterface(marshal, stream, &IID_IUri, (void**)&uri); + ok(hr == S_OK, "%d) UnmarshalInterface failed 0x%08x, expected S_OK.\n", i, hr); + hr = IUri_GetRawUri(uri, &raw_uri); + ok(hr == S_OK, "%d) GetRawUri failed 0x%08x, expected S_OK.\n", i, hr); + ok(!strcmp_aw(test->str_props[Uri_PROPERTY_RAW_URI].value, raw_uri) + || broken(test->str_props[Uri_PROPERTY_RAW_URI].broken_value + && !strcmp_aw(test->str_props[Uri_PROPERTY_RAW_URI].broken_value, raw_uri)), + "%d) Expected %s but got %s.\n", i, test->str_props[Uri_PROPERTY_RAW_URI].value, + wine_dbgstr_w(raw_uri)); + SysFreeString(raw_uri); IMarshal_Release(marshal); IStream_Release(stream);

1 0

Aric Stewart : quartz: Implement IObjectWithSite and IAMGraphBuilderCallback for the FilterGraph.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 8c91f1bf5e5a22ad90e7c1723b62342c3734fda8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c91f1bf5e5a22ad90e7c1723… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 16 08:12:23 2012 -0600 quartz: Implement IObjectWithSite and IAMGraphBuilderCallback for the FilterGraph. --- dlls/quartz/filtergraph.c | 105 +++++++++++++++++++++++++++++++++++++++++++++ include/axextend.idl | 16 +++++++ 2 files changed, 121 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 64c2d06..32aa569 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -160,6 +160,7 @@ typedef struct _IFilterGraphImpl { IMediaEventSink IMediaEventSink_iface; IGraphConfig IGraphConfig_iface; IMediaPosition IMediaPosition_iface; + IObjectWithSite IObjectWithSite_iface; const IUnknownVtbl * IInner_vtbl; /* IAMGraphStreams */ /* IAMStats */ @@ -204,6 +205,7 @@ typedef struct _IFilterGraphImpl { REFERENCE_TIME pause_time; LONGLONG stop_position; LONG recursioncount; + IUnknown *pSite; } IFilterGraphImpl; static HRESULT Filtergraph_QueryInterface(IFilterGraphImpl *This, @@ -261,6 +263,9 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown * iface, } else if (IsEqualGUID(&IID_IMediaPosition, riid)) { *ppvObj = &This->IMediaPosition_iface; TRACE(" returning IMediaPosition interface (%p)\n", *ppvObj); + } else if (IsEqualGUID(&IID_IObjectWithSite, riid)) { + *ppvObj = &This->IObjectWithSite_iface; + TRACE(" returning IObjectWithSite interface (%p)\n", *ppvObj); } else if (IsEqualGUID(&IID_IFilterMapper, riid)) { TRACE(" requesting IFilterMapper interface from aggregated filtermapper (%p)\n", *ppvObj); return IUnknown_QueryInterface(This->punkFilterMapper2, riid, ppvObj); @@ -327,6 +332,8 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown * iface) IFilterMapper2_Release(This->pFilterMapper2); IUnknown_Release(This->punkFilterMapper2); + if (This->pSite) IUnknown_Release(This->pSite); + CloseHandle(This->hEventCompletion); EventsQueue_Destroy(&This->evqueue); This->cs.DebugInfo->Spare[0] = 0; @@ -1020,6 +1027,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, IPin** ppins; IPin* ppinfilter = NULL; IBaseFilter* pfilter = NULL; + IAMGraphBuilderCallback *callback = NULL; hr = GetFilterInfo(pMoniker, &clsid, &var); IMoniker_Release(pMoniker); @@ -1033,12 +1041,42 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, goto error; } + if (This->pSite) + { + IUnknown_QueryInterface(This->pSite, &IID_IAMGraphBuilderCallback, (LPVOID*)&callback); + if (callback) + { + HRESULT rc; + rc = IAMGraphBuilderCallback_SelectedFilter(callback, pMoniker); + if (FAILED(rc)) + { + TRACE("Filter rejected by IAMGraphBuilderCallback_SelectedFilter\n"); + IUnknown_Release(callback); + goto error; + } + } + } + hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&pfilter); if (FAILED(hr)) { WARN("Unable to create filter (%x), trying next one\n", hr); goto error; } + if (callback) + { + HRESULT rc; + rc = IAMGraphBuilderCallback_CreatedFilter(callback, pfilter); + IUnknown_Release(callback); + if (FAILED(rc)) + { + IBaseFilter_Release(pfilter); + pfilter = NULL; + TRACE("Filter rejected by IAMGraphBuilderCallback_CreatedFilter\n"); + goto error; + } + } + hr = IFilterGraph2_AddFilter(iface, pfilter, V_UNION(&var, bstrVal)); if (FAILED(hr)) { WARN("Unable to add filter (%x)\n", hr); @@ -2768,6 +2806,71 @@ static const IMediaPositionVtbl IMediaPosition_VTable = MediaPosition_CanSeekBackward }; +static inline IFilterGraphImpl *impl_from_IObjectWithSite(IObjectWithSite *iface) +{ + return CONTAINING_RECORD(iface, IFilterGraphImpl, IObjectWithSite_iface); +} + +/*** IUnknown methods ***/ +static HRESULT WINAPI ObjectWithSite_QueryInterface(IObjectWithSite* iface, REFIID riid, void** ppvObj) +{ + IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); + + TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); + return Filtergraph_QueryInterface(This, riid, ppvObj); +} + +static ULONG WINAPI ObjectWithSite_AddRef(IObjectWithSite *iface) +{ + IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); + + TRACE("(%p/%p)->()\n", This, iface); + return Filtergraph_AddRef(This); +} + +static ULONG WINAPI ObjectWithSite_Release(IObjectWithSite *iface) +{ + IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); + + TRACE("(%p/%p)->()\n", This, iface); + return Filtergraph_Release(This); +} + +/*** IObjectWithSite methods ***/ + +static HRESULT WINAPI ObjectWithSite_SetSite(IObjectWithSite *iface, IUnknown *pUnkSite) +{ + IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); + + TRACE("(%p/%p)->()\n", This, iface); + if (This->pSite) IUnknown_Release(This->pSite); + This->pSite = pUnkSite; + IUnknown_AddRef(This->pSite); + return S_OK; +} + +static HRESULT WINAPI ObjectWithSite_GetSite(IObjectWithSite *iface, REFIID riid, PVOID *ppvSite) +{ + IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); + + TRACE("(%p/%p)->(%s)\n", This, iface,debugstr_guid(riid)); + + *ppvSite = NULL; + if (!This->pSite) + return E_FAIL; + else + return IUnknown_QueryInterface(This->pSite, riid, ppvSite); +} + +static const IObjectWithSiteVtbl IObjectWithSite_VTable = +{ + ObjectWithSite_QueryInterface, + ObjectWithSite_AddRef, + ObjectWithSite_Release, + ObjectWithSite_SetSite, + ObjectWithSite_GetSite, +}; + static HRESULT GetTargetInterface(IFilterGraphImpl* pGraph, REFIID riid, LPVOID* ppvObj) { HRESULT hr = E_NOINTERFACE; @@ -5506,6 +5609,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->IMediaEventSink_iface.lpVtbl = &IMediaEventSink_VTable; fimpl->IGraphConfig_iface.lpVtbl = &IGraphConfig_VTable; fimpl->IMediaPosition_iface.lpVtbl = &IMediaPosition_VTable; + fimpl->IObjectWithSite_iface.lpVtbl = &IObjectWithSite_VTable; fimpl->ref = 1; fimpl->ppFiltersInGraph = NULL; fimpl->pFilterNames = NULL; @@ -5523,6 +5627,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->EcCompleteCount = 0; fimpl->refClockProvider = NULL; fimpl->state = State_Stopped; + fimpl->pSite = NULL; EventsQueue_Init(&fimpl->evqueue); InitializeCriticalSection(&fimpl->cs); fimpl->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IFilterGraphImpl.cs"); diff --git a/include/axextend.idl b/include/axextend.idl index c546a7e..bf87731 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -45,6 +45,7 @@ interface IAMVfwCompressDialogs; interface IAMVideoCompression; interface IAMVideoDecimationProperties; interface IAMVideoProcAmp; +interface IAMGraphBuilderCallback; interface ICaptureGraphBuilder; interface ICaptureGraphBuilder2; interface IConfigAviMux; @@ -1010,3 +1011,18 @@ interface IAMFilterMiscFlags : IUnknown { ULONG GetMiscFlags(); }; + +[ + local, + object, + uuid(4995f511-9ddb-4f12-bd3b-f04611807b79), + pointer_default(unique) +] +interface IAMGraphBuilderCallback : IUnknown +{ + HRESULT SelectedFilter( + [in] IMoniker *pMon); + + HRESULT CreatedFilter( + [in] IBaseFilter *pFil); +};

1 0

Aric Stewart : wineqtdecoder: Zero out the whole QTSplitter structure on creation.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 3ef34d77996914e55e9aef3ca6518db36dc8a0a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ef34d77996914e55e9aef3ca… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 16 10:11:47 2012 -0600 wineqtdecoder: Zero out the whole QTSplitter structure on creation. --- dlls/wineqtdecoder/qtsplitter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 06709c3..a42f984 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -233,6 +233,7 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr) *phr = E_OUTOFMEMORY; return NULL; } + ZeroMemory(This,sizeof(*This)); BaseFilter_Init(&This->filter, &QT_Vtbl, &CLSID_QTSplitter, (DWORD_PTR)(__FILE__ ": QTSplitter.csFilter"), &BaseFuncTable); @@ -250,7 +251,6 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr) This->pInputPin.pin.refCount = 1; This->pInputPin.pin.pConnectedTo = NULL; This->pInputPin.pin.pCritSec = &This->filter.csFilter; - ZeroMemory(&This->pInputPin.pin.mtCurrent, sizeof(AM_MEDIA_TYPE)); *phr = S_OK; return obj; }

1 0

Aric Stewart : wineqtdecoder: Improve and differentiate Sample Time and MediaTime.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 2ea8f8a4a062b2f2832d60afce377bcc1da7725c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea8f8a4a062b2f2832d60afc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 16 10:13:12 2012 -0600 wineqtdecoder: Improve and differentiate Sample Time and MediaTime. --- dlls/wineqtdecoder/qtsplitter.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index a42f984..17f173c 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -467,6 +467,7 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) do { LONGLONG tStart=0, tStop=0; + LONGLONG mStart=0, mStop=0; float time; GetMovieNextInterestingTime(This->pQTMovie, nextTimeStep, 0, NULL, movie_time, 1, &next_time, NULL); @@ -485,6 +486,9 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) TRACE("In loop at time %ld\n",movie_time); TRACE("In Next time %ld\n",next_time); + mStart = movie_time; + mStop = next_time; + time = (float)movie_time / tr.scale; tStart = time * 10000000; time = (float)next_time / tr.scale; @@ -539,11 +543,8 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) IMediaSample_SetActualDataLength(sample, frames * pvi->nBlockAlign); - IMediaSample_SetMediaTime(sample, &tStart, &tStop); - if (tStart) - IMediaSample_SetTime(sample, &tStart, &tStop); - else - IMediaSample_SetTime(sample, NULL, NULL); + IMediaSample_SetMediaTime(sample, &mStart, &mStop); + IMediaSample_SetTime(sample, &tStart, &tStop); hr = OutputQueue_Receive(This->pAudio_Pin->queue, sample); TRACE("Audio Delivered (%x)\n",hr); @@ -597,11 +598,8 @@ audio_error: IMediaSample_SetActualDataLength(sample, This->outputSize); - IMediaSample_SetMediaTime(sample, &tStart, &tStop); - if (tStart) - IMediaSample_SetTime(sample, &tStart, &tStop); - else - IMediaSample_SetTime(sample, NULL, NULL); + IMediaSample_SetMediaTime(sample, &mStart, &mStop); + IMediaSample_SetTime(sample, &tStart, &tStop); hr = OutputQueue_Receive(This->pVideo_Pin->queue, sample); TRACE("Video Delivered (%x)\n",hr);

1 0