February 2020 - Wine-commits

Nikolay Sivov : ole32: Respond to CLSID in antimoniker interface query.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: 8f34b9e834ce2b6b83b27a6f954f4852be0de9aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f34b9e834ce2b6b83b27a6f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 31 13:37:34 2020 +0300 ole32: Respond to CLSID in antimoniker interface query. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/antimoniker.c | 10 ++++------ dlls/ole32/tests/moniker.c | 8 ++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 7abbfc544f..c0937a8d90 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -81,19 +81,19 @@ AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); - /* Perform a sanity check on the parameters.*/ if ( ppvObject==0 ) return E_INVALIDARG; - /* Initialize the return parameter */ *ppvObject = 0; - /* Compare the riid with the interface IDs implemented by this object.*/ if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IPersist, riid) || IsEqualIID(&IID_IPersistStream, riid) || - IsEqualIID(&IID_IMoniker, riid)) + IsEqualIID(&IID_IMoniker, riid) || + IsEqualGUID(&CLSID_AntiMoniker, riid)) + { *ppvObject = iface; + } else if (IsEqualIID(&IID_IROTData, riid)) *ppvObject = &This->IROTData_iface; else if (IsEqualIID(&IID_IMarshal, riid)) @@ -106,11 +106,9 @@ AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) return IUnknown_QueryInterface(This->pMarshal, riid, ppvObject); } - /* Check that we obtained an interface.*/ if ((*ppvObject)==0) return E_NOINTERFACE; - /* always increase the reference count by one when it is successful */ IMoniker_AddRef(iface); return S_OK; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 7e7d615645..3dd7048ef4 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2454,13 +2454,9 @@ static void test_anti_moniker(void) ok_ole_success(hr, CreateAntiMoniker); hr = IMoniker_QueryInterface(moniker, &CLSID_AntiMoniker, (void **)&unknown); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); - IUnknown_Release(unknown); - } + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); test_moniker("anti moniker", moniker, expected_anti_moniker_marshal_data, sizeof(expected_anti_moniker_marshal_data),

1 0

Zebediah Figura : strmbase: Fix printing negative values in debugstr_time().
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: f8a63ffda47974fc0a8d8e8080d39bf9e1173922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8a63ffda47974fc0a8d8e80… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 19:05:16 2020 -0600 strmbase: Fix printing negative values in debugstr_time(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/strmbase_private.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index b03258bc41..f9ddcad9a6 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -34,15 +34,17 @@ static inline const char *debugstr_time(REFERENCE_TIME time) { + ULONGLONG abstime = time >= 0 ? time : -time; unsigned int i = 0, j = 0; - char buffer[22], rev[22]; + char buffer[23], rev[23]; - while (time || i <= 8) + while (abstime || i <= 8) { - buffer[i++] = '0' + (time % 10); - time /= 10; + buffer[i++] = '0' + (abstime % 10); + abstime /= 10; if (i == 7) buffer[i++] = '.'; } + if (time < 0) buffer[i++] = '-'; while (i--) rev[j++] = buffer[i]; rev[j] = 0;

1 0

Zebediah Figura : quartz: Introduce a helper to trace reference time.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: eea01d8e8bd1a73369f64f9cec19eb6900a31ef3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eea01d8e8bd1a73369f64f9c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 19:05:17 2020 -0600 quartz: Introduce a helper to trace reference time. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 4 ++-- dlls/quartz/dsoundrender.c | 7 ++++--- dlls/quartz/filtergraph.c | 12 ++++++++++-- dlls/quartz/memallocator.c | 6 ++++-- dlls/quartz/quartz_private.h | 20 ++++++++++++++++++++ dlls/quartz/systemclock.c | 7 +++---- 6 files changed, 43 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 33d9debe5c..aa34f3ae26 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -163,7 +163,7 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam goto error; } - TRACE("Sample start time: %u.%03u\n", (DWORD)(tStart/10000000), (DWORD)((tStart/10000)%1000)); + TRACE("Sample start time: %s.\n", debugstr_time(tStart)); if (ash.cbSrcLengthUsed == cbSrcStream) { IMediaSample_SetTime(pOutSample, &tStart, &tStop); @@ -196,7 +196,7 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam IMediaSample_SetMediaTime(pOutSample, NULL, NULL); } - TRACE("Sample stop time: %u.%03u\n", (DWORD)(tStart/10000000), (DWORD)((tStart/10000)%1000)); + TRACE("Sample stop time: %s\n", debugstr_time(tStart)); hr = IMemInputPin_Receive(This->tf.source.pMemInputPin, pOutSample); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) { diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 6fd49dac9b..4a0f5c4d10 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -171,7 +171,7 @@ static HRESULT DSoundRender_GetWritePos(DSoundRenderImpl *This, DWORD *ret_write *ret_writepos = writepos; } else if (delta_t < 0) { REFERENCE_TIME past, min_writepos_t; - WARN("Delta too big %i/%i, overwriting old data or even skipping\n", (int)delta_t / 10000, (int)max_lag / 10000); + WARN("Delta too big %s/%s, overwriting old data or even skipping\n", debugstr_time(delta_t), debugstr_time(max_lag)); if (min_writepos >= playpos) min_writepos_t = cur + time_from_pos(This, min_writepos - playpos); else @@ -189,7 +189,7 @@ static HRESULT DSoundRender_GetWritePos(DSoundRenderImpl *This, DWORD *ret_write } } else /* delta_t > 0 */ { DWORD aheadbytes; - WARN("Delta too big %i/%i, too far ahead\n", (int)delta_t / 10000, (int)max_lag / 10000); + WARN("Delta too big %s/%s, too far ahead\n", debugstr_time(delta_t), debugstr_time(max_lag)); aheadbytes = pos_from_time(This, delta_t); WARN("Advancing %u bytes\n", aheadbytes); if (delta_t >= DSoundRenderer_Max_Fill) @@ -204,7 +204,8 @@ end: else *pfree = This->buf_size + playpos - *ret_writepos; if (time_from_pos(This, This->buf_size - *pfree) >= DSoundRenderer_Max_Fill) { - TRACE("Blocked: too full %i / %i\n", (int)(time_from_pos(This, This->buf_size - *pfree)/10000), (int)(DSoundRenderer_Max_Fill / 10000)); + TRACE("Blocked: too full %s / %s\n", debugstr_time(time_from_pos(This, This->buf_size - *pfree)), + debugstr_time(DSoundRenderer_Max_Fill)); return S_FALSE; } return S_OK; diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index e30dae0a59..cd4e7f40e0 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2500,6 +2500,8 @@ static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLON } LeaveCriticalSection(&graph->cs); + + TRACE("Returning %s (%s seconds).\n", wine_dbgstr_longlong(*stop), debugstr_time(*stop)); return hr; } @@ -2525,7 +2527,7 @@ static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONG LeaveCriticalSection(&graph->cs); - TRACE("Returning %s.\n", wine_dbgstr_longlong(ret)); + TRACE("Returning %s (%s seconds).\n", wine_dbgstr_longlong(ret), debugstr_time(ret)); *current = ret; return S_OK; @@ -2565,6 +2567,12 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * TRACE("graph %p, current %s, current_flags %#x, stop %s, stop_flags %#x.\n", graph, current_ptr ? wine_dbgstr_longlong(*current_ptr) : "<null>", current_flags, stop_ptr ? wine_dbgstr_longlong(*stop_ptr): "<null>", stop_flags); + if (current_ptr) + TRACE("Setting current position to %s (%s seconds).\n", + wine_dbgstr_longlong(*current_ptr), debugstr_time(*current_ptr)); + if (stop_ptr) + TRACE("Setting stop position to %s (%s seconds).\n", + wine_dbgstr_longlong(*stop_ptr), debugstr_time(*stop_ptr)); if ((current_flags & 0x7) != AM_SEEKING_AbsolutePositioning && (current_flags & 0x7) != AM_SEEKING_NoPositioning) @@ -5249,7 +5257,7 @@ static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME start) IFilterGraphImpl *graph = impl_from_IMediaFilter(iface); REFERENCE_TIME stream_start = start; - TRACE("graph %p, start %s.\n", graph, wine_dbgstr_longlong(start)); + TRACE("graph %p, start %s.\n", graph, debugstr_time(start)); EnterCriticalSection(&graph->cs); diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 2f5855e95b..fab0f2d1c4 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -564,7 +564,8 @@ static HRESULT WINAPI StdMediaSample2_SetTime(IMediaSample2 *iface, REFERENCE_TI { StdMediaSample2 *sample = impl_from_IMediaSample2(iface); - TRACE("iface %p, start %p, end %p.\n", iface, start, end); + TRACE("sample %p, start %s, end %s.\n", sample, start ? debugstr_time(*start) : "(null)", + end ? debugstr_time(*end) : "(null)"); if (start) { @@ -745,7 +746,8 @@ static HRESULT WINAPI StdMediaSample2_SetMediaTime(IMediaSample2 *iface, LONGLON { StdMediaSample2 *sample = impl_from_IMediaSample2(iface); - TRACE("sample %p, start %p, end %p.\n", iface, start, end); + TRACE("sample %p, start %s, end %s.\n", sample, start ? debugstr_time(*start) : "(null)", + end ? debugstr_time(*end) : "(null)"); if (start) { diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 791bec7db6..3431a5836f 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -36,6 +36,26 @@ #include "wine/strmbase.h" #include "wine/list.h" +static inline const char *debugstr_time(REFERENCE_TIME time) +{ + ULONGLONG abstime = time >= 0 ? time : -time; + unsigned int i = 0, j = 0; + char buffer[23], rev[23]; + + while (abstime || i <= 8) + { + buffer[i++] = '0' + (abstime % 10); + abstime /= 10; + if (i == 7) buffer[i++] = '.'; + } + if (time < 0) buffer[i++] = '-'; + + while (i--) rev[j++] = buffer[i]; + rev[j] = 0; + + return wine_dbg_sprintf("%s", rev); +} + /* see IAsyncReader::Request on MSDN for the explanation of this */ #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) #define BYTES_FROM_MEDIATIME(time) ((time) / 10000000) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 8122cc5b0b..51e96c82e6 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -202,8 +202,6 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_ REFERENCE_TIME ret; HRESULT hr; - TRACE("clock %p, time %p.\n", clock, time); - if (!time) { return E_POINTER; } @@ -217,6 +215,7 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_ LeaveCriticalSection(&clock->cs); + TRACE("clock %p, time %p, returning %s.\n", clock, time, debugstr_time(ret)); return hr; } @@ -227,7 +226,7 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, struct advise_sink *sink; TRACE("clock %p, base %s, offset %s, event %#lx, cookie %p.\n", - clock, wine_dbgstr_longlong(base), wine_dbgstr_longlong(offset), event, cookie); + clock, debugstr_time(base), debugstr_time(offset), event, cookie); if (!event) return E_INVALIDARG; @@ -263,7 +262,7 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, struct advise_sink *sink; TRACE("clock %p, start %s, period %s, semaphore %#lx, cookie %p.\n", - clock, wine_dbgstr_longlong(start), wine_dbgstr_longlong(period), semaphore, cookie); + clock, debugstr_time(start), debugstr_time(period), semaphore, cookie); if (!semaphore) return E_INVALIDARG;

1 0

Zebediah Figura : strmbase: Store the filter name and graph directly in the strmbase_filter structure.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: 6f71e2c48dcfdc5d2c5087b2d685d7fea85a44e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f71e2c48dcfdc5d2c5087b2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 19:05:18 2020 -0600 strmbase: Store the filter name and graph directly in the strmbase_filter structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 5 ++--- dlls/qcap/vfwcapture.c | 4 ++-- dlls/qedit/samplegrabber.c | 2 -- dlls/strmbase/filter.c | 40 +++++++++++++++++++++------------------- dlls/strmbase/renderer.c | 2 +- include/wine/strmbase.h | 3 ++- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index e402479fb1..91a0b17f8e 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -772,8 +772,7 @@ static HRESULT WINAPI ConfigInterleaving_put_Mode( if(This->mode != mode) { if(This->source.pin.peer) { - HRESULT hr = IFilterGraph_Reconnect(This->filter.filterInfo.pGraph, - &This->source.pin.IPin_iface); + HRESULT hr = IFilterGraph_Reconnect(This->filter.graph, &This->source.pin.IPin_iface); if(FAILED(hr)) return hr; } @@ -1152,7 +1151,7 @@ static HRESULT WINAPI AviMuxOut_AttemptConnection(struct strmbase_source *iface, if (!filter->in[i]->pin.pin.peer) continue; - hr = IFilterGraph_Reconnect(filter->filter.filterInfo.pGraph, &filter->in[i]->pin.pin.IPin_iface); + hr = IFilterGraph_Reconnect(filter->filter.graph, &filter->in[i]->pin.pin.IPin_iface); if (FAILED(hr)) { IPin_Disconnect(&iface->pin.IPin_iface); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index b4716bf192..30869ede13 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -216,9 +216,9 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt) } hr = qcap_driver_set_format(This->driver_info, pmt); - if (SUCCEEDED(hr) && This->filter.filterInfo.pGraph && This->source.pin.peer) + if (SUCCEEDED(hr) && This->filter.graph && This->source.pin.peer) { - hr = IFilterGraph_Reconnect(This->filter.filterInfo.pGraph, &This->source.pin.IPin_iface); + hr = IFilterGraph_Reconnect(This->filter.graph, &This->source.pin.IPin_iface); if (SUCCEEDED(hr)) TRACE("Reconnection completed, with new media format..\n"); } diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index edb814468a..7652f70d95 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -80,8 +80,6 @@ static inline SG_Impl *impl_from_IMemInputPin(IMemInputPin *iface) static void SampleGrabber_cleanup(SG_Impl *This) { TRACE("(%p)\n", This); - if (This->filter.filterInfo.pGraph) - WARN("(%p) still joined to filter graph %p\n", This, This->filter.filterInfo.pGraph); if (This->allocator) IMemAllocator_Release(This->allocator); if (This->grabberIface) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 43da4b3fb9..84521b8099 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -443,35 +443,37 @@ static HRESULT WINAPI filter_FindPin(IBaseFilter *iface, const WCHAR *id, IPin * return VFW_E_NOT_FOUND; } -static HRESULT WINAPI filter_QueryFilterInfo(IBaseFilter *iface, FILTER_INFO *pInfo) +static HRESULT WINAPI filter_QueryFilterInfo(IBaseFilter *iface, FILTER_INFO *info) { - struct strmbase_filter *This = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%p)\n", This, pInfo); + struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - lstrcpyW(pInfo->achName, This->filterInfo.achName); - pInfo->pGraph = This->filterInfo.pGraph; + TRACE("filter %p, info %p.\n", filter, info); - if (pInfo->pGraph) - IFilterGraph_AddRef(pInfo->pGraph); + lstrcpyW(info->achName, filter->name); + info->pGraph = filter->graph; + + if (info->pGraph) + IFilterGraph_AddRef(info->pGraph); return S_OK; } -static HRESULT WINAPI filter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *pGraph, const WCHAR *pName) +static HRESULT WINAPI filter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *graph, const WCHAR *name) { - struct strmbase_filter *This = impl_from_IBaseFilter(iface); + struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%p, %s)\n", This, pGraph, debugstr_w(pName)); + TRACE("filter %p, graph %p, name %s.\n", filter, graph, debugstr_w(name)); - EnterCriticalSection(&This->csFilter); - { - if (pName) - lstrcpynW(This->filterInfo.achName, pName, MAX_FILTER_NAME); - else - *This->filterInfo.achName = '\0'; - This->filterInfo.pGraph = pGraph; /* NOTE: do NOT increase ref. count */ - } - LeaveCriticalSection(&This->csFilter); + EnterCriticalSection(&filter->csFilter); + + if (name) + lstrcpynW(filter->name, name, ARRAY_SIZE(filter->name)); + else + filter->name[0] = 0; + /* The graph references us, so we cannot also reference the graph. */ + filter->graph = graph; + + LeaveCriticalSection(&filter->csFilter); return S_OK; } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 1bc581963c..974823b046 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -199,7 +199,7 @@ static void sink_disconnect(struct strmbase_sink *iface) static HRESULT sink_eos(struct strmbase_sink *iface) { struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface); - IFilterGraph *graph = filter->filter.filterInfo.pGraph; + IFilterGraph *graph = filter->filter.graph; IMediaEventSink *event_sink; HRESULT hr = S_OK; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index abb04a8384..ae0fadb391 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -130,7 +130,8 @@ struct strmbase_filter FILTER_STATE state; IReferenceClock * pClock; - FILTER_INFO filterInfo; + WCHAR name[128]; + IFilterGraph *graph; CLSID clsid; LONG pin_version;

1 0

Zebediah Figura : strmbase: Rename the "pClock" member of struct strmbase_filter to "clock".
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: 4a9893d4fca5fb056316d19b8164fd5881e8bc0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a9893d4fca5fb056316d19b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 19:05:19 2020 -0600 strmbase: Rename the "pClock" member of struct strmbase_filter to "clock". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 8 +++---- dlls/strmbase/filter.c | 50 ++++++++++++++++++++++-------------------- dlls/strmbase/qualitycontrol.c | 12 +++++----- dlls/strmbase/renderer.c | 8 +++---- include/wine/strmbase.h | 2 +- 5 files changed, 41 insertions(+), 39 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 4a0f5c4d10..4e991ff561 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -141,9 +141,9 @@ static HRESULT DSoundRender_GetWritePos(DSoundRenderImpl *This, DWORD *ret_write DSoundRender_UpdatePositions(This, &writepos, &min_writepos); playpos = This->last_playpos; - if (This->renderer.filter.pClock) + if (This->renderer.filter.clock) { - IReferenceClock_GetTime(This->renderer.filter.pClock, &cur); + IReferenceClock_GetTime(This->renderer.filter.clock, &cur); cur -= This->renderer.stream_start; } else write_at = -1; @@ -363,10 +363,10 @@ static HRESULT WINAPI DSoundRender_DoRenderSample(struct strmbase_renderer *ifac TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream); hr = DSoundRender_SendSampleData(This, tStart, tStop, pbSrcStream, cbSrcStream); - if (This->renderer.filter.state == State_Running && This->renderer.filter.pClock && tStart >= 0) { + if (This->renderer.filter.state == State_Running && This->renderer.filter.clock && tStart >= 0) { REFERENCE_TIME jitter, now = 0; Quality q; - IReferenceClock_GetTime(This->renderer.filter.pClock, &now); + IReferenceClock_GetTime(This->renderer.filter.clock, &now); jitter = now - This->renderer.stream_start - tStart; if (jitter <= -DSoundRenderer_Max_Fill) jitter += DSoundRenderer_Max_Fill; diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 84521b8099..98ec3c6f44 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -380,36 +380,38 @@ static HRESULT WINAPI filter_GetState(IBaseFilter *iface, DWORD timeout, FILTER_ return hr; } -static HRESULT WINAPI filter_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock) +static HRESULT WINAPI filter_SetSyncSource(IBaseFilter *iface, IReferenceClock *clock) { - struct strmbase_filter *This = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%p)\n", This, pClock); + struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - EnterCriticalSection(&This->csFilter); - { - if (This->pClock) - IReferenceClock_Release(This->pClock); - This->pClock = pClock; - if (This->pClock) - IReferenceClock_AddRef(This->pClock); - } - LeaveCriticalSection(&This->csFilter); + TRACE("filter %p, clock %p.\n", filter, clock); + + EnterCriticalSection(&filter->csFilter); + + if (filter->clock) + IReferenceClock_Release(filter->clock); + filter->clock = clock; + if (filter->clock) + IReferenceClock_AddRef(filter->clock); + + LeaveCriticalSection(&filter->csFilter); return S_OK; } -static HRESULT WINAPI filter_GetSyncSource(IBaseFilter *iface, IReferenceClock **ppClock) +static HRESULT WINAPI filter_GetSyncSource(IBaseFilter *iface, IReferenceClock **clock) { - struct strmbase_filter *This = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%p)\n", This, ppClock); + struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - EnterCriticalSection(&This->csFilter); - { - *ppClock = This->pClock; - if (This->pClock) - IReferenceClock_AddRef(This->pClock); - } - LeaveCriticalSection(&This->csFilter); + TRACE("filter %p, clock %p.\n", filter, clock); + + EnterCriticalSection(&filter->csFilter); + + *clock = filter->clock; + if (filter->clock) + IReferenceClock_AddRef(filter->clock); + + LeaveCriticalSection(&filter->csFilter); return S_OK; } @@ -528,8 +530,8 @@ void strmbase_filter_init(struct strmbase_filter *filter, IUnknown *outer, void strmbase_filter_cleanup(struct strmbase_filter *This) { - if (This->pClock) - IReferenceClock_Release(This->pClock); + if (This->clock) + IReferenceClock_Release(This->clock); This->IBaseFilter_iface.lpVtbl = NULL; DeleteCriticalSection(&This->csFilter); diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index a7e6e71364..763108d46a 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -160,7 +160,7 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) TRACE("%p\n", priv); - if (!priv->pin->filter->pClock || priv->current_rstart < 0) + if (!priv->pin->filter->clock || priv->current_rstart < 0) return; start = priv->current_rstart; @@ -276,7 +276,7 @@ void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME s if (start >= 0) { REFERENCE_TIME now; - IReferenceClock_GetTime(This->pin->filter->pClock, &now); + IReferenceClock_GetTime(This->pin->filter->clock, &now); This->current_jitter = (now - This->clockstart) - start; } else @@ -291,10 +291,10 @@ void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME s else This->rendered++; - if (!This->pin->filter->pClock) + if (!This->pin->filter->clock) return; - IReferenceClock_GetTime(This->pin->filter->pClock, &This->start); + IReferenceClock_GetTime(This->pin->filter->clock, &This->start); TRACE("Starting at %s.\n", debugstr_time(This->start)); } @@ -305,8 +305,8 @@ void QualityControlRender_EndRender(QualityControlImpl *This) TRACE("%p\n", This); - if (!This->pin->filter->pClock || This->start < 0 - || FAILED(IReferenceClock_GetTime(This->pin->filter->pClock, &This->stop))) + if (!This->pin->filter->clock || This->start < 0 + || FAILED(IReferenceClock_GetTime(This->pin->filter->clock, &This->stop))) return; elapsed = This->start - This->stop; diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 974823b046..8470da40f0 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -331,7 +331,7 @@ HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSa SetEvent(This->state_event); /* Wait for render Time */ - if (This->filter.pClock && SUCCEEDED(IMediaSample_GetTime(pSample, &start, &stop))) + if (This->filter.clock && SUCCEEDED(IMediaSample_GetTime(pSample, &start, &stop))) { hr = S_FALSE; RendererPosPassThru_RegisterMediaTime(This->pPosition, start); @@ -345,20 +345,20 @@ HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSa REFERENCE_TIME now; DWORD_PTR cookie; - IReferenceClock_GetTime(This->filter.pClock, &now); + IReferenceClock_GetTime(This->filter.clock, &now); if (now - This->stream_start - start <= -10000) { HANDLE handles[2] = {This->advise_event, This->flush_event}; DWORD ret; - IReferenceClock_AdviseTime(This->filter.pClock, This->stream_start, + IReferenceClock_AdviseTime(This->filter.clock, This->stream_start, start, (HEVENT)This->advise_event, &cookie); LeaveCriticalSection(&This->csRenderLock); ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); - IReferenceClock_Unadvise(This->filter.pClock, cookie); + IReferenceClock_Unadvise(This->filter.clock, cookie); if (ret == 1) { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index ae0fadb391..965f6be401 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -129,7 +129,7 @@ struct strmbase_filter CRITICAL_SECTION csFilter; FILTER_STATE state; - IReferenceClock * pClock; + IReferenceClock *clock; WCHAR name[128]; IFilterGraph *graph; CLSID clsid;

1 0

Zebediah Figura : strmbase: Trace the filter name in IBaseFilter methods.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: 1f04af881d34afcd64c32e8d907d48d14e3040bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f04af881d34afcd64c32e8d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 19:05:20 2020 -0600 strmbase: Trace the filter name in IBaseFilter methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/filter.c | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 98ec3c6f44..2809832ee8 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -208,7 +208,7 @@ static HRESULT WINAPI filter_inner_QueryInterface(IUnknown *iface, REFIID iid, v struct strmbase_filter *filter = impl_from_IUnknown(iface); HRESULT hr; - TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + TRACE("filter %p %s, iid %s, out %p.\n", filter, debugstr_w(filter->name), debugstr_guid(iid), out); *out = NULL; @@ -289,12 +289,13 @@ static ULONG WINAPI filter_Release(IBaseFilter *iface) return IUnknown_Release(filter->outer_unk); } -static HRESULT WINAPI filter_GetClassID(IBaseFilter * iface, CLSID * pClsid) +static HRESULT WINAPI filter_GetClassID(IBaseFilter *iface, CLSID *clsid) { - struct strmbase_filter *This = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%p)\n", This, pClsid); + struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - *pClsid = This->clsid; + TRACE("filter %p %s, clsid %p.\n", filter, debugstr_w(filter->name), clsid); + + *clsid = filter->clsid; return S_OK; } @@ -304,7 +305,7 @@ static HRESULT WINAPI filter_Stop(IBaseFilter *iface) struct strmbase_filter *filter = impl_from_IBaseFilter(iface); HRESULT hr = S_OK; - TRACE("filter %p.\n", filter); + TRACE("filter %p %s.\n", filter, debugstr_w(filter->name)); EnterCriticalSection(&filter->csFilter); @@ -325,7 +326,7 @@ static HRESULT WINAPI filter_Pause(IBaseFilter *iface) struct strmbase_filter *filter = impl_from_IBaseFilter(iface); HRESULT hr = S_OK; - TRACE("filter %p.\n", filter); + TRACE("filter %p %s.\n", filter, debugstr_w(filter->name)); EnterCriticalSection(&filter->csFilter); @@ -346,7 +347,7 @@ static HRESULT WINAPI filter_Run(IBaseFilter *iface, REFERENCE_TIME start) struct strmbase_filter *filter = impl_from_IBaseFilter(iface); HRESULT hr = S_OK; - TRACE("filter %p, start %s.\n", filter, debugstr_time(start)); + TRACE("filter %p %s, start %s.\n", filter, debugstr_w(filter->name), debugstr_time(start)); EnterCriticalSection(&filter->csFilter); @@ -367,7 +368,7 @@ static HRESULT WINAPI filter_GetState(IBaseFilter *iface, DWORD timeout, FILTER_ struct strmbase_filter *filter = impl_from_IBaseFilter(iface); HRESULT hr = S_OK; - TRACE("filter %p, timeout %u, state %p.\n", filter, timeout, state); + TRACE("filter %p %s, timeout %u, state %p.\n", filter, debugstr_w(filter->name), timeout, state); EnterCriticalSection(&filter->csFilter); @@ -384,7 +385,7 @@ static HRESULT WINAPI filter_SetSyncSource(IBaseFilter *iface, IReferenceClock * { struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - TRACE("filter %p, clock %p.\n", filter, clock); + TRACE("filter %p %s, clock %p.\n", filter, debugstr_w(filter->name), clock); EnterCriticalSection(&filter->csFilter); @@ -403,7 +404,7 @@ static HRESULT WINAPI filter_GetSyncSource(IBaseFilter *iface, IReferenceClock * { struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - TRACE("filter %p, clock %p.\n", filter, clock); + TRACE("filter %p %s, clock %p.\n", filter, debugstr_w(filter->name), clock); EnterCriticalSection(&filter->csFilter); @@ -420,20 +421,20 @@ static HRESULT WINAPI filter_EnumPins(IBaseFilter *iface, IEnumPins **enum_pins) { struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - TRACE("iface %p, enum_pins %p.\n", iface, enum_pins); + TRACE("filter %p %s, enum_pins %p.\n", filter, debugstr_w(filter->name), enum_pins); return enum_pins_create(filter, enum_pins); } static HRESULT WINAPI filter_FindPin(IBaseFilter *iface, const WCHAR *id, IPin **ret) { - struct strmbase_filter *This = impl_from_IBaseFilter(iface); + struct strmbase_filter *filter = impl_from_IBaseFilter(iface); struct strmbase_pin *pin; unsigned int i; - TRACE("(%p)->(%s, %p)\n", This, debugstr_w(id), ret); + TRACE("filter %p %s, id %s, ret %p.\n", filter, debugstr_w(filter->name), debugstr_w(id), ret); - for (i = 0; (pin = This->ops->filter_get_pin(This, i)); ++i) + for (i = 0; (pin = filter->ops->filter_get_pin(filter, i)); ++i) { if (!lstrcmpW(id, pin->name)) { @@ -449,7 +450,7 @@ static HRESULT WINAPI filter_QueryFilterInfo(IBaseFilter *iface, FILTER_INFO *in { struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - TRACE("filter %p, info %p.\n", filter, info); + TRACE("filter %p %s, info %p.\n", filter, debugstr_w(filter->name), info); lstrcpyW(info->achName, filter->name); info->pGraph = filter->graph; @@ -464,7 +465,7 @@ static HRESULT WINAPI filter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *g { struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - TRACE("filter %p, graph %p, name %s.\n", filter, graph, debugstr_w(name)); + TRACE("filter %p %s, graph %p, name %s.\n", filter, debugstr_w(filter->name), graph, debugstr_w(name)); EnterCriticalSection(&filter->csFilter); @@ -480,9 +481,12 @@ static HRESULT WINAPI filter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *g return S_OK; } -static HRESULT WINAPI filter_QueryVendorInfo(IBaseFilter *iface, WCHAR **pVendorInfo) +static HRESULT WINAPI filter_QueryVendorInfo(IBaseFilter *iface, WCHAR **info) { - TRACE("(%p)->(%p)\n", iface, pVendorInfo); + struct strmbase_filter *filter = impl_from_IBaseFilter(iface); + + TRACE("filter %p %s, info %p.\n", filter, debugstr_w(filter->name), info); + return E_NOTIMPL; }

1 0

Zebediah Figura : strmbase: Trace the pin and filter names in IPin and IMemInputPin methods.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: 6656933d783ed360237962cfe1179c8414df60a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6656933d783ed360237962cf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 19:05:21 2020 -0600 strmbase: Trace the pin and filter names in IPin and IMemInputPin methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 118 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 70 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6656933d783ed3602379…

1 0

Zebediah Figura : ntdll/tests: Add more tests for printf format specifiers.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: 9c3dcdfb6c36e8301a09f5e13fbec8c37571899d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c3dcdfb6c36e8301a09f5e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 21:36:14 2020 -0600 ntdll/tests: Add more tests for printf format specifiers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/string.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 12027e8899..72428fca91 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1349,7 +1349,28 @@ static void test__snprintf(void) memset(buffer, 0x7c, sizeof(buffer)); res = p__snprintf(buffer, 3, "test"); ok(res == -1, "res = %d\n", res); - } + + res = p__snprintf(buffer, sizeof(buffer), "%I64x %d", (ULONGLONG)0x1234567890, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "1234567890 1"), "got %s\n", debugstr_a(buffer)); + + res = p__snprintf(buffer, sizeof(buffer), "%I32x %d", 0x123456, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "123456 1"), "got %s\n", debugstr_a(buffer)); + + if (sizeof(void *) == 8) + { + res = p__snprintf(buffer, sizeof(buffer), "%Ix %d", (ULONG_PTR)0x1234567890, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + todo_wine ok(!strcmp(buffer, "1234567890 1"), "got %s\n", debugstr_a(buffer)); + } + else + { + res = p__snprintf(buffer, sizeof(buffer), "%Ix %d", (ULONG_PTR)0x123456, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "123456 1"), "got %s\n", debugstr_a(buffer)); + } +} static void test__snprintf_s(void) {

1 0

Zebediah Figura : ntdll: Support the %I format modifier.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: b41ab972ec7e3da950f0c9e514a5530f48ea931c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b41ab972ec7e3da950f0c9e5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 21:36:15 2020 -0600 ntdll: Support the %I format modifier. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/printf.c | 6 ++++++ dlls/ntdll/tests/string.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index f61441b36b..d5b197396a 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -561,6 +561,12 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis } else if( *(p+1) == '3' && *(p+2) == '2' ) p += 3; + else if( p[1] && strchr( "diouxX", p[1] ) ) + { + if( sizeof(void *) == 8 ) + flags.IntegerDouble = *p; + p++; + } else if( isDigit(*(p+1)) || *(p+1) == 0 ) break; else diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 72428fca91..dfdc4f3140 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1362,7 +1362,7 @@ static void test__snprintf(void) { res = p__snprintf(buffer, sizeof(buffer), "%Ix %d", (ULONG_PTR)0x1234567890, 1); ok(res == strlen(buffer), "wrong size %d\n", res); - todo_wine ok(!strcmp(buffer, "1234567890 1"), "got %s\n", debugstr_a(buffer)); + ok(!strcmp(buffer, "1234567890 1"), "got %s\n", debugstr_a(buffer)); } else {

1 0

Zebediah Figura : kernelbase: Use the %I length modifier to print pointer-size integers.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: 69996b61307fe7e2764cf06abbdf85639b16f7a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69996b61307fe7e2764cf06a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 21:36:16 2020 -0600 kernelbase: Use the %I length modifier to print pointer-size integers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index a07dddb1fc..b125f100f6 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -514,7 +514,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR } break; default: - FIXME("Unsupported attribute %#lx.\n", attrs->attrs[i].attr); + FIXME("Unsupported attribute %#Ix.\n", attrs->attrs[i].attr); break; } }

1 0