wine-commits November 2010

wine-commits@winehq.org

2 participants
866 discussions

Henri Verbeet : wined3d: Move the fullscreen window setup / restore code to the device.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 45cee64295e00681dabb0343e89b3727f8e8da70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45cee64295e00681dabb0343e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 8 11:50:31 2010 +0100 wined3d: Move the fullscreen window setup / restore code to the device. --- dlls/wined3d/device.c | 91 ++++++++++++++++++++++++++++++++++++++- dlls/wined3d/swapchain.c | 91 +--------------------------------------- dlls/wined3d/wined3d_private.h | 4 +- 3 files changed, 92 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45cee64295e00681dabb0…

1 0

Maarten Lankhorst : strmbase: Add support for IQualityControl to transform filter.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 5955a349c6c3196374fd118eb6ccb7a5d63b12a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5955a349c6c3196374fd118eb… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 5 23:19:14 2010 +0100 strmbase: Add support for IQualityControl to transform filter. --- dlls/strmbase/transform.c | 28 ++++++++++++++++++++++++++++ include/wine/strmbase.h | 3 +++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index e17620c..029d289 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -44,6 +44,7 @@ static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n' static const IBaseFilterVtbl TransformFilter_Vtbl; static const IPinVtbl TransformFilter_InputPin_Vtbl; static const IPinVtbl TransformFilter_OutputPin_Vtbl; +static const IQualityControlVtbl TransformFilter_QualityControl_Vtbl; static HRESULT WINAPI TransformFilter_Input_CheckMediaType(BasePin *iface, const AM_MEDIA_TYPE * pmt) { @@ -198,6 +199,10 @@ static HRESULT TransformFilter_Init(const IBaseFilterVtbl *pVtbl, const CLSID* p if (FAILED(hr)) ERR("Cannot create output pin (%x)\n", hr); + else { + QualityControlImpl_init(&pTransformFilter->qcimpl, (IPin*)pTransformFilter->ppPins[0], (IBaseFilter*)pTransformFilter); + pTransformFilter->qcimpl.lpVtbl = &TransformFilter_QualityControl_Vtbl; + } } if (FAILED(hr)) { @@ -238,6 +243,11 @@ HRESULT WINAPI TransformFilterImpl_QueryInterface(IBaseFilter * iface, REFIID ri TransformFilter *This = (TransformFilter *)iface; TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv); + if (IsEqualIID(riid, &IID_IQualityControl)) { + *ppv = (IQualityControl*)&This->qcimpl; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } hr = BaseFilterImpl_QueryInterface(iface, riid, ppv); if (FAILED(hr) && (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow))) @@ -547,3 +557,21 @@ static const IPinVtbl TransformFilter_OutputPin_Vtbl = BaseOutputPinImpl_EndFlush, BasePinImpl_NewSegment }; + +HRESULT WINAPI TransformFilter_QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { + QualityControlImpl *qc = (QualityControlImpl*)iface; + TransformFilter *This = (TransformFilter *)qc->self; + + if (This->pFuncsTable->pfnNotify) + return This->pFuncsTable->pfnNotify(This, sender, qm); + else + return QualityControlImpl_Notify(iface, sender, qm); +} + +static const IQualityControlVtbl TransformFilter_QualityControl_Vtbl = { + QualityControlImpl_QueryInterface, + QualityControlImpl_AddRef, + QualityControlImpl_Release, + TransformFilter_QualityControlImpl_Notify, + QualityControlImpl_SetSink +}; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index b748930..bbb1363 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -219,6 +219,7 @@ typedef struct TransformFilter AM_MEDIA_TYPE pmt; const struct TransformFilterFuncTable * pFuncsTable; + QualityControlImpl qcimpl; } TransformFilter; typedef HRESULT (WINAPI *TransformFilter_DecideBufferSize) (TransformFilter *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest); @@ -234,6 +235,7 @@ typedef HRESULT (WINAPI *TransformFilter_BeginFlush) (TransformFilter *iface); typedef HRESULT (WINAPI *TransformFilter_EndFlush) (TransformFilter *iface); typedef HRESULT (WINAPI *TransformFilter_NewSegment) (TransformFilter *iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate); +typedef HRESULT (WINAPI *TransformFilter_Notify) (TransformFilter *iface, IBaseFilter *sender, Quality qm); typedef struct TransformFilterFuncTable { /* Required */ @@ -250,6 +252,7 @@ typedef struct TransformFilterFuncTable { TransformFilter_BeginFlush pfnBeginFlush; TransformFilter_EndFlush pfnEndFlush; TransformFilter_NewSegment pfnNewSegment; + TransformFilter_Notify pfnNotify; } TransformFilterFuncTable; HRESULT WINAPI TransformFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv);

1 0

Maarten Lankhorst : quartz: Add IQualityControl to video renderer.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: b6fd7bc133158f8da13df35586df404433b0907f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6fd7bc133158f8da13df3558… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 5 23:19:13 2010 +0100 quartz: Add IQualityControl to video renderer. --- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/quartz/videorenderer.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 967abd4..860b30d 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -70,6 +70,8 @@ static void test_query_interface(void) RELEASE_EXPECT(pBasicVideo, 1); QI_SUCCEED(pVideoRenderer, IID_IMediaSeeking, pMediaSeeking); RELEASE_EXPECT(pMediaSeeking, 1); + QI_SUCCEED(pVideoRenderer, IID_IQualityControl, pQualityControl); + RELEASE_EXPECT(pQualityControl, 1); todo_wine { QI_SUCCEED(pVideoRenderer, IID_IDirectDrawVideo, pDirectDrawVideo); RELEASE_EXPECT(pDirectDrawVideo, 1); @@ -77,8 +79,6 @@ static void test_query_interface(void) RELEASE_EXPECT(pKsPropertySet, 1); QI_SUCCEED(pVideoRenderer, IID_IMediaPosition, pMediaPosition); RELEASE_EXPECT(pMediaPosition, 1); - QI_SUCCEED(pVideoRenderer, IID_IQualityControl, pQualityControl); - RELEASE_EXPECT(pQualityControl, 1); QI_SUCCEED(pVideoRenderer, IID_IQualProp, pQualProp); RELEASE_EXPECT(pQualProp, 1); } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 3a35f38..e135fb9 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -53,6 +53,13 @@ static const IBasicVideoVtbl IBasicVideo_VTable; static const IVideoWindowVtbl IVideoWindow_VTable; static const IPinVtbl VideoRenderer_InputPin_Vtbl; static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; +static const IQualityControlVtbl VideoRenderer_QualityControl_Vtbl = { + QualityControlImpl_QueryInterface, + QualityControlImpl_AddRef, + QualityControlImpl_Release, + QualityControlImpl_Notify, + QualityControlImpl_SetSink +}; typedef struct VideoRendererImpl { @@ -62,6 +69,7 @@ typedef struct VideoRendererImpl const IUnknownVtbl * IInner_vtbl; const IAMFilterMiscFlagsVtbl *IAMFilterMiscFlags_vtbl; IUnknown *seekthru_unk; + QualityControlImpl qcimpl; BaseInputPin *pInputPin; @@ -622,6 +630,9 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) if (FAILED(hr)) goto fail; + QualityControlImpl_init(&pVideoRenderer->qcimpl, (IPin*)pVideoRenderer->pInputPin, (IBaseFilter*)pVideoRenderer); + pVideoRenderer->qcimpl.lpVtbl = &VideoRenderer_QualityControl_Vtbl; + if (!CreateRenderingSubsystem(pVideoRenderer)) return E_FAIL; @@ -671,6 +682,8 @@ static HRESULT WINAPI VideoRendererInner_QueryInterface(IUnknown * iface, REFIID return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) *ppv = &This->IAMFilterMiscFlags_vtbl; + else if (IsEqualIID(riid, &IID_IQualityControl)) + *ppv = &This->qcimpl; if (*ppv) {

1 0

Maarten Lankhorst : quartz: Forward IQualityControl on pullpin to base filter.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 3329873b818bfbb2b70846b6f2aa34bd07f5b973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3329873b818bfbb2b70846b6f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 5 23:19:12 2010 +0100 quartz: Forward IQualityControl on pullpin to base filter. --- dlls/quartz/pin.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 118be2c..297b2d6 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -337,9 +337,10 @@ HRESULT WINAPI PullPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) *ppv = iface; else if (IsEqualIID(riid, &IID_IPin)) *ppv = iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) + else if (IsEqualIID(riid, &IID_IMediaSeeking) || + IsEqualIID(riid, &IID_IQualityControl)) { - return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); + return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, riid, ppv); } if (*ppv)

1 0

Maarten Lankhorst : strmbase: Forward IQualityControl on output pin to base filter.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 81763bf2ba6638de16f5fa2f4e57cc3f831102d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81763bf2ba6638de16f5fa2f4… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 5 23:19:11 2010 +0100 strmbase: Forward IQualityControl on output pin to base filter. --- dlls/strmbase/pin.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 1b0b48c..1731145 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -359,9 +359,10 @@ HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOI *ppv = iface; else if (IsEqualIID(riid, &IID_IPin)) *ppv = iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) + else if (IsEqualIID(riid, &IID_IMediaSeeking) || + IsEqualIID(riid, &IID_IQualityControl)) { - return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); + return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, riid, ppv); } if (*ppv)

1 0

Maarten Lankhorst : strmbase: Add support for IQualityControl.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 0a4ee681682c2943b3a22e29ef995c737bb7c33b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a4ee681682c2943b3a22e29e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 5 23:19:10 2010 +0100 strmbase: Add support for IQualityControl. --- dlls/strmbase/Makefile.in | 1 + dlls/strmbase/qualitycontrol.c | 79 ++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 15 ++++++++ 3 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index 4c1f2ab..9ecb169 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -6,6 +6,7 @@ C_SRCS = \ filter.c \ mediatype.c \ pin.c \ + qualitycontrol.c \ seeking.c \ transform.c diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c new file mode 100644 index 0000000..d97350a --- /dev/null +++ b/dlls/strmbase/qualitycontrol.c @@ -0,0 +1,79 @@ +/* + * Quality Control Interfaces + * + * Copyright 2010 Maarten Lankhorst 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 + */ + +#define COBJMACROS + +#include "dshow.h" +#include "wine/strmbase.h" + +#include "uuids.h" +#include "wine/debug.h" + +#include <assert.h> + +WINE_DEFAULT_DEBUG_CHANNEL(strmbase); + +void QualityControlImpl_init(QualityControlImpl *This, IPin *input, IBaseFilter *self) { + This->input = input; + This->self = self; + This->tonotify = NULL; +} + +HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { + QualityControlImpl *This = (QualityControlImpl*)iface; + return IUnknown_QueryInterface(This->self, riid, ppv); +} + +ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface) { + QualityControlImpl *This = (QualityControlImpl*)iface; + return IUnknown_AddRef(This->self); +} + +ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface) { + QualityControlImpl *This = (QualityControlImpl*)iface; + return IUnknown_Release(This->self); +} + +HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { + HRESULT hr = S_FALSE; + QualityControlImpl *This = (QualityControlImpl*)iface; + if (This->tonotify) + return IQualityControl_Notify(This->tonotify, This->self, qm); + if (This->input) { + IPin *to = NULL; + IPin_ConnectedTo(This->input, &to); + if (to) { + IQualityControl *qc = NULL; + IUnknown_QueryInterface(to, &IID_IQualityControl, (void**)&qc); + if (qc) { + hr = IQualityControl_Notify(qc, This->self, qm); + IQualityControl_Release(qc); + } + IPin_Release(to); + } + } + return hr; +} + +HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify) { + QualityControlImpl *This = (QualityControlImpl*)iface; + This->tonotify = tonotify; + return S_OK; +} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index e79ab37..b748930 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -194,6 +194,21 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *iface, BasePin_GetMediaType enu HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin receive_pin, BaseFilter_GetPinCount receive_pincount, BaseFilter_GetPinVersion receive_version, IEnumPins ** ppEnum); +/* Quality Control */ +typedef struct QualityControlImpl { + const IQualityControlVtbl *lpVtbl; + IPin *input; + IBaseFilter *self; + IQualityControl *tonotify; +} QualityControlImpl; + +void QualityControlImpl_init(QualityControlImpl *This, IPin *input, IBaseFilter *self); +HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv); +ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface); +ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface); +HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm); +HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify); + /* Transform Filter */ typedef struct TransformFilter {

1 0

Maarten Lankhorst : quartz: Actually use the start time in SendRun.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 120dd66ed2ba4374d93013e125d2682c003969f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=120dd66ed2ba4374d93013e12… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 5 23:19:09 2010 +0100 quartz: Actually use the start time in SendRun. --- dlls/quartz/filtergraph.c | 19 ++----------------- 1 files changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 44f87b2..f8d2ff2 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1829,21 +1829,7 @@ static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundF static HRESULT WINAPI SendRun(IBaseFilter *pFilter, DWORD_PTR data) { - LONGLONG time = 0; - IReferenceClock *clock = NULL; - - IBaseFilter_GetSyncSource(pFilter, &clock); - if (clock) - { - IReferenceClock_GetTime(clock, &time); - if (time) - /* Add 50 ms */ - time += 500000; - if (time < 0) - time = 0; - IReferenceClock_Release(clock); - } - + REFERENCE_TIME time = *(REFERENCE_TIME*)data; return IBaseFilter_Run(pFilter, time); } @@ -1940,7 +1926,6 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); TRACE("(%p/%p)->()\n", This, iface); - EnterCriticalSection(&This->cs); if (This->state == State_Running) goto out; @@ -1957,7 +1942,7 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) { } else This->start_time = 0; - SendFilterMessage(iface, SendRun, 0); + SendFilterMessage(iface, SendRun, (DWORD_PTR)&This->start_time); This->state = State_Running; out: LeaveCriticalSection(&This->cs);

1 0

Maarten Lankhorst : quartz: Remove position from filtergraph.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 4f8584ac2734ca6e649661824051d39f0320e95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f8584ac2734ca6e649661824… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 5 23:19:08 2010 +0100 quartz: Remove position from filtergraph. --- dlls/quartz/filtergraph.c | 59 ++++++++++++++++++++------------------------ 1 files changed, 27 insertions(+), 32 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 8c7339b..44f87b2 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -203,7 +203,6 @@ typedef struct _IFilterGraphImpl { GUID timeformatseek; REFERENCE_TIME start_time; REFERENCE_TIME pause_time; - LONGLONG position; LONGLONG stop_position; LONG recursioncount; } IFilterGraphImpl; @@ -1956,7 +1955,7 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) { else This->start_time += now - This->pause_time; } - else This->position = This->start_time = 0; + else This->start_time = 0; SendFilterMessage(iface, SendRun, 0); This->state = State_Running; @@ -1990,13 +1989,6 @@ static HRESULT WINAPI MediaControl_Stop(IMediaControl *iface) { if (This->state == State_Stopped) return S_OK; EnterCriticalSection(&This->cs); - if (This->state == State_Running && This->refClock) - { - LONGLONG time = This->start_time; - IReferenceClock_GetTime(This->refClock, &time); - This->position += time - This->start_time; - } - if (This->state == State_Running) SendFilterMessage(iface, SendPause, 0); SendFilterMessage(iface, SendStop, 0); This->state = State_Stopped; @@ -2319,10 +2311,8 @@ static HRESULT WINAPI FoundDuration(IFilterGraphImpl *This, IMediaSeeking *seek, if (FAILED(hr)) return hr; - /* FIXME: Minimum or maximum duration? Assuming minimum */ - if (duration > 0 && *pdur < duration) + if (*pdur < duration) *pdur = duration; - return hr; } @@ -2337,7 +2327,7 @@ static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, return E_POINTER; EnterCriticalSection(&This->cs); - *pDuration = -1; + *pDuration = 0; hr = all_renderers_seek(This, FoundDuration, (DWORD_PTR)pDuration); LeaveCriticalSection(&This->cs); @@ -2361,37 +2351,45 @@ static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, hr = IMediaSeeking_GetDuration(iface, pStop); else *pStop = This->stop_position; - LeaveCriticalSection(&This->cs); return hr; } +static HRESULT WINAPI FoundCurrentPosition(IFilterGraphImpl *This, IMediaSeeking *seek, DWORD_PTR pposition) +{ + HRESULT hr; + LONGLONG pos = 0, *ppos = (LONGLONG*)pposition; + + hr = IMediaSeeking_GetCurrentPosition(seek, &pos); + if (FAILED(hr)) + return hr; + + if (*ppos < 0 || pos < *ppos) + *ppos = pos; + return hr; +} + static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *pCurrent) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaSeeking_vtbl, iface); - LONGLONG time = 0; + HRESULT hr; if (!pCurrent) return E_POINTER; EnterCriticalSection(&This->cs); - if (This->state == State_Running && This->refClock) - { - IReferenceClock_GetTime(This->refClock, &time); - if (time) - time += This->position - This->start_time; - if (time < This->position) - time = This->position; - *pCurrent = time; + *pCurrent = -1; + hr = all_renderers_seek(This, FoundCurrentPosition, (DWORD_PTR)pCurrent); + if (hr == E_NOTIMPL) { + *pCurrent = 0; + hr = S_OK; } - else - *pCurrent = This->position; LeaveCriticalSection(&This->cs); TRACE("Time: %u.%03u\n", (DWORD)(*pCurrent / 10000000), (DWORD)((*pCurrent / 10000)%1000)); - return S_OK; + return hr; } static HRESULT WINAPI MediaSeeking_ConvertTimeFormat(IMediaSeeking *iface, @@ -2435,11 +2433,8 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, state = This->state; TRACE("State: %s\n", state == State_Running ? "Running" : (state == State_Paused ? "Paused" : (state == State_Stopped ? "Stopped" : "UNKNOWN"))); - if ((dwCurrentFlags & 0x7) == AM_SEEKING_AbsolutePositioning) - { - This->position = *pCurrent; - } - else if ((dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning) + if ((dwCurrentFlags & 0x7) != AM_SEEKING_AbsolutePositioning && + (dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning) FIXME("Adjust method %x not handled yet!\n", dwCurrentFlags & 0x7); if ((dwStopFlags & 0x7) == AM_SEEKING_AbsolutePositioning) @@ -5477,7 +5472,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IFilterGraphImpl.cs"); fimpl->nItfCacheEntries = 0; memcpy(&fimpl->timeformatseek, &TIME_FORMAT_MEDIA_TIME, sizeof(GUID)); - fimpl->start_time = fimpl->position = 0; + fimpl->start_time = fimpl->pause_time = 0; fimpl->stop_position = -1; fimpl->punkFilterMapper2 = NULL; fimpl->recursioncount = 0;

1 0

Detlef Riekenberg : wtsapi32: Add a stub for WTSLogoffSession.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 2e0e6677c66bad85b548d70237b8a85253972b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0e6677c66bad85b548d7023… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 7 20:13:59 2010 +0100 wtsapi32: Add a stub for WTSLogoffSession. --- dlls/wtsapi32/wtsapi32.c | 10 ++++++++++ dlls/wtsapi32/wtsapi32.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index ab35de4..604752a 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -142,6 +142,16 @@ void WINAPI WTSFreeMemory(PVOID pMemory) } /************************************************************ + * WTSLogoffSession (WTSAPI32.@) + */ +BOOL WINAPI WTSLogoffSession(HANDLE hserver, DWORD session_id, BOOL bwait) +{ + FIXME("(%p, 0x%x, %d): stub\n", hserver, session_id, bwait); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/************************************************************ * WTSOpenServerA (WTSAPI32.@) */ HANDLE WINAPI WTSOpenServerA(LPSTR pServerName) diff --git a/dlls/wtsapi32/wtsapi32.spec b/dlls/wtsapi32/wtsapi32.spec index 2be9df0..f20bbe2 100644 --- a/dlls/wtsapi32/wtsapi32.spec +++ b/dlls/wtsapi32/wtsapi32.spec @@ -7,7 +7,7 @@ @ stdcall WTSEnumerateSessionsA(long long long ptr ptr) @ stdcall WTSEnumerateSessionsW(long long long ptr ptr) @ stdcall WTSFreeMemory(ptr) -@ stub WTSLogoffSession +@ stdcall WTSLogoffSession(ptr long long) @ stdcall WTSOpenServerA(ptr) @ stdcall WTSOpenServerW(ptr) @ stdcall WTSQuerySessionInformationA(long long long ptr ptr)

1 0

Eric Pouech : server: Removed the no longer used bare parameter out of get_console_mode request.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 91e3a40e412a6c04cfaf8f6d0d3d16a1a4c4bfdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=91e3a40e412a6c04cfaf8f6d0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 7 19:15:01 2010 +0100 server: Removed the no longer used bare parameter out of get_console_mode request. --- dlls/kernel32/console.c | 32 +++++++++++++------------------- include/wine/server_protocol.h | 4 ++-- server/console.c | 6 ++---- server/protocol.def | 1 - server/request.h | 1 - server/trace.c | 1 - 6 files changed, 17 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 2ea1cd8..d49731f 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -131,23 +131,6 @@ static void char_info_AtoW( CHAR_INFO *buffer, int count ) } } -static BOOL get_console_mode(HANDLE conin, DWORD* mode, BOOL* bare) -{ - BOOL ret; - - SERVER_START_REQ( get_console_mode ) - { - req->handle = console_handle_unmap(conin); - if ((ret = !wine_server_call_err( req ))) - { - if (mode) *mode = reply->mode; - if (bare) *bare = reply->is_bare; - } - } - SERVER_END_REQ; - return ret; -} - static struct termios S_termios; /* saved termios for bare consoles */ static BOOL S_termios_raw /* = FALSE */; @@ -1174,7 +1157,7 @@ static enum read_console_input_return read_console_input(HANDLE handle, PINPUT_R } else { - if (!get_console_mode(handle, NULL, NULL)) return rci_error; + if (!VerifyConsoleIoHandle(handle)) return rci_error; if (WaitForSingleObject(GetConsoleInputWaitHandle(), timeout) != WAIT_OBJECT_0) return rci_timeout; @@ -2135,7 +2118,18 @@ BOOL WINAPI SetConsoleActiveScreenBuffer(HANDLE hConsoleOutput) */ BOOL WINAPI GetConsoleMode(HANDLE hcon, LPDWORD mode) { - return get_console_mode(hcon, mode, NULL); + BOOL ret; + + SERVER_START_REQ( get_console_mode ) + { + req->handle = console_handle_unmap(hcon); + if ((ret = !wine_server_call_err( req ))) + { + if (mode) *mode = reply->mode; + } + } + SERVER_END_REQ; + return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e41d8f7..72f3cde 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1550,7 +1550,7 @@ struct get_console_mode_reply { struct reply_header __header; int mode; - int is_bare; + char __pad_12[4]; }; @@ -5519,6 +5519,6 @@ union generic_reply struct set_cursor_reply set_cursor_reply; }; -#define SERVER_PROTOCOL_VERSION 410 +#define SERVER_PROTOCOL_VERSION 411 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/console.c b/server/console.c index 4441163..42d985d 100644 --- a/server/console.c +++ b/server/console.c @@ -565,7 +565,7 @@ static void propagate_console_signal( struct console_input *console, enum_processes(propagate_console_signal_cb, &csi); } -static int get_console_mode( obj_handle_t handle, int *bare ) +static int get_console_mode( obj_handle_t handle ) { struct object *obj; int ret = 0; @@ -575,12 +575,10 @@ static int get_console_mode( obj_handle_t handle, int *bare ) if (obj->ops == &console_input_ops) { ret = ((struct console_input *)obj)->mode; - *bare = console_input_is_bare((struct console_input *)obj); } else if (obj->ops == &screen_buffer_ops) { ret = ((struct screen_buffer *)obj)->mode; - *bare = console_input_is_bare(((struct screen_buffer *)obj)->input); } else set_error( STATUS_OBJECT_TYPE_MISMATCH ); @@ -1537,7 +1535,7 @@ DECL_HANDLER(get_console_input_info) /* get a console mode (input or output) */ DECL_HANDLER(get_console_mode) { - reply->mode = get_console_mode( req->handle, &reply->is_bare ); + reply->mode = get_console_mode( req->handle ); } /* set a console mode (input or output) */ diff --git a/server/protocol.def b/server/protocol.def index 321a933..6245f4c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1226,7 +1226,6 @@ struct console_renderer_event obj_handle_t handle; /* handle to the console */ @REPLY int mode; /* console mode */ - int is_bare; /* whether the console has an evt_queue */ @END diff --git a/server/request.h b/server/request.h index 55af0e1..e0bffaf 100644 --- a/server/request.h +++ b/server/request.h @@ -976,7 +976,6 @@ C_ASSERT( sizeof(struct get_console_wait_event_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_console_mode_request, handle) == 12 ); C_ASSERT( sizeof(struct get_console_mode_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_console_mode_reply, mode) == 8 ); -C_ASSERT( FIELD_OFFSET(struct get_console_mode_reply, is_bare) == 12 ); C_ASSERT( sizeof(struct get_console_mode_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_console_mode_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_console_mode_request, mode) == 16 ); diff --git a/server/trace.c b/server/trace.c index b6155a1..83d5b16 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1649,7 +1649,6 @@ static void dump_get_console_mode_request( const struct get_console_mode_request static void dump_get_console_mode_reply( const struct get_console_mode_reply *req ) { fprintf( stderr, " mode=%d", req->mode ); - fprintf( stderr, ", is_bare=%d", req->is_bare ); } static void dump_set_console_mode_request( const struct set_console_mode_request *req )

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
87
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 November 2010