February 2020 - Wine-Commits

Zebediah Figura : strmbase: Trace the filter name in IBaseFilter methods.
by Alexandre Julliard Feb. 2, 2020

Feb. 2, 2020

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: Rename the "pClock" member of struct strmbase_filter to "clock".
by Alexandre Julliard Feb. 2, 2020

Feb. 2, 2020

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

Brendan Shanks : user32: Support SetWindowPos() SWP_ASYNCWINDOWPOS flag.
by Alexandre Julliard Feb. 2, 2020

Feb. 2, 2020

Module: wine Branch: master Commit: 22e0f03e9290f289c317468533a4d5f86630d56b URL: https://source.winehq.org/git/wine.git/?a=commit;h=22e0f03e9290f289c3174685… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jan 28 14:56:12 2020 -0800 user32: Support SetWindowPos() SWP_ASYNCWINDOWPOS flag. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index f759bd10f9..b92a20df18 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2387,7 +2387,10 @@ BOOL WINAPI SetWindowPos( HWND hwnd, HWND hwndInsertAfter, if (WIN_IsCurrentThread( hwnd )) return USER_SetWindowPos( &winpos, 0, 0 ); - return SendMessageW( winpos.hwnd, WM_WINE_SETWINDOWPOS, 0, (LPARAM)&winpos ); + if (flags & SWP_ASYNCWINDOWPOS) + return SendNotifyMessageW( winpos.hwnd, WM_WINE_SETWINDOWPOS, 0, (LPARAM)&winpos ); + else + return SendMessageW( winpos.hwnd, WM_WINE_SETWINDOWPOS, 0, (LPARAM)&winpos ); }

1 0

Zebediah Figura : ntdll: Support the %I format modifier.
by Alexandre Julliard Feb. 2, 2020

Feb. 2, 2020

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