wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Zebediah Figura : quartz: Use strmbase_dump_media_type() where appropriate.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: c4e3f4180dcdec1a4d9087a029b50670985ba606 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4e3f4180dcdec1a4d9087a0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 5 19:18:51 2019 -0500 quartz: Use strmbase_dump_media_type() where appropriate. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 1 - dlls/quartz/avidec.c | 1 - dlls/quartz/dsoundrender.c | 17 ----------------- dlls/quartz/enummedia.c | 32 -------------------------------- dlls/quartz/filesource.c | 2 +- dlls/quartz/filtergraph.c | 3 +++ dlls/quartz/quartz_private.h | 2 -- dlls/quartz/videorenderer.c | 8 -------- dlls/quartz/vmr9.c | 11 ----------- 9 files changed, 4 insertions(+), 73 deletions(-) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index fd2397668d..b79bed1949 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -8,7 +8,6 @@ C_SRCS = \ acmwrapper.c \ avidec.c \ dsoundrender.c \ - enummedia.c \ enummoniker.c \ enumregfilters.c \ filesource.c \ diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index ce38b6963c..7352a28db8 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -240,7 +240,6 @@ static HRESULT WINAPI AVIDec_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir bmi = &format2->bmiHeader; else goto failed; - TRACE("Fourcc: %s\n", debugstr_an((const char *)&pmt->subtype.Data1, 4)); This->hvid = ICLocate(pmt->majortype.Data1, pmt->subtype.Data1, bmi, NULL, ICMODE_DECOMPRESS); if (This->hvid) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index d3c382f166..6ba6e4c7ae 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -400,20 +400,9 @@ static HRESULT WINAPI DSoundRender_DoRenderSample(BaseRenderer *iface, IMediaSam static HRESULT WINAPI DSoundRender_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TYPE * pmt) { - WAVEFORMATEX* format; - if (!IsEqualIID(&pmt->majortype, &MEDIATYPE_Audio)) return S_FALSE; - format = (WAVEFORMATEX*)pmt->pbFormat; - TRACE("Format = %p\n", format); - TRACE("wFormatTag = %x %x\n", format->wFormatTag, WAVE_FORMAT_PCM); - TRACE("nChannels = %d\n", format->nChannels); - TRACE("nSamplesPerSec = %d\n", format->nSamplesPerSec); - TRACE("nAvgBytesPerSec = %d\n", format->nAvgBytesPerSec); - TRACE("nBlockAlign = %d\n", format->nBlockAlign); - TRACE("wBitsPerSample = %d\n", format->wBitsPerSample); - if (!IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_PCM)) return S_FALSE; @@ -451,12 +440,6 @@ static HRESULT WINAPI DSoundRender_CompleteConnect(BaseRenderer * iface, IPin * DSBUFFERDESC buf_desc; TRACE("(%p)->(%p)\n", This, pReceivePin); - dump_AM_MEDIA_TYPE(pmt); - - TRACE("MajorType %s\n", debugstr_guid(&pmt->majortype)); - TRACE("SubType %s\n", debugstr_guid(&pmt->subtype)); - TRACE("Format %s\n", debugstr_guid(&pmt->formattype)); - TRACE("Size %d\n", pmt->cbFormat); format = (WAVEFORMATEX*)pmt->pbFormat; diff --git a/dlls/quartz/enummedia.c b/dlls/quartz/enummedia.c deleted file mode 100644 index b3acc5d4e2..0000000000 --- a/dlls/quartz/enummedia.c +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Implementation of IEnumMediaTypes Interface - * - * Copyright 2003 Robert Shearman - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "quartz_private.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); - -void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt) -{ - if (!pmt) - return; - TRACE("\t%s\n\t%s\n\t...\n\t%s\n", qzdebugstr_guid(&pmt->majortype), qzdebugstr_guid(&pmt->subtype), qzdebugstr_guid(&pmt->formattype)); -} diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 36b7e95ad6..8a921954dd 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -474,6 +474,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi AsyncReader *This = impl_from_IFileSourceFilter(iface); TRACE("%p->(%s, %p)\n", This, debugstr_w(pszFileName), pmt); + strmbase_dump_media_type(pmt); if (!pszFileName) return E_POINTER; @@ -645,7 +646,6 @@ static HRESULT WINAPI FileAsyncReaderPin_AttemptConnection(struct strmbase_sourc HRESULT hr; TRACE("%p->(%p, %p)\n", This, pReceivePin, pmt); - dump_AM_MEDIA_TYPE(pmt); /* FIXME: call queryacceptproc */ diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4dd3075463..3017ee7408 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -830,6 +830,7 @@ static HRESULT WINAPI FilterGraph2_ConnectDirect(IFilterGraph2 *iface, IPin *ppi HRESULT hr; TRACE("(%p/%p)->(%p, %p, %p)\n", This, iface, ppinIn, ppinOut, pmt); + strmbase_dump_media_type(pmt); /* FIXME: check pins are in graph */ @@ -1834,6 +1835,7 @@ static HRESULT WINAPI FilterGraph2_ReconnectEx(IFilterGraph2 *iface, IPin *ppin, IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); TRACE("(%p/%p)->(%p %p): stub !!!\n", This, iface, ppin, pmt); + strmbase_dump_media_type(pmt); return S_OK; } @@ -5461,6 +5463,7 @@ static HRESULT WINAPI GraphConfig_Reconnect(IGraphConfig *iface, IPin *pOutputPi IFilterGraphImpl *This = impl_from_IGraphConfig(iface); FIXME("(%p)->(%p, %p, %p, %p, %p, %x): stub!\n", This, pOutputPin, pInputPin, pmtFirstConnection, pUsingFilter, hAbortEvent, dwFlags); + strmbase_dump_media_type(pmtFirstConnection); return E_NOTIMPL; } diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 1213aea352..f3ba39fba9 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -62,8 +62,6 @@ HRESULT IEnumRegFiltersImpl_Construct(REGFILTER * pInRegFilters, const ULONG siz extern const char * qzdebugstr_guid(const GUID * id) DECLSPEC_HIDDEN; extern void video_unregister_windowclass(void) DECLSPEC_HIDDEN; -void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt) DECLSPEC_HIDDEN; - BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID *source_clsid) DECLSPEC_HIDDEN; #endif /* __QUARTZ_PRIVATE_INCLUDED__ */ diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 87ff9f59bf..43aef9ffbe 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -176,14 +176,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, return VFW_E_RUNTIME_ERROR; } - TRACE("biSize = %d\n", bmiHeader->biSize); - TRACE("biWidth = %d\n", bmiHeader->biWidth); - TRACE("biHeight = %d\n", bmiHeader->biHeight); - TRACE("biPlanes = %d\n", bmiHeader->biPlanes); - TRACE("biBitCount = %d\n", bmiHeader->biBitCount); - TRACE("biCompression = %s\n", debugstr_an((LPSTR)&(bmiHeader->biCompression), 4)); - TRACE("biSizeImage = %d\n", bmiHeader->biSizeImage); - if (!This->baseControlWindow.baseWindow.hDC) { ERR("Cannot get DC from window!\n"); return E_FAIL; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 600e75945a..0e04fef366 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -214,14 +214,6 @@ static DWORD VMR9_SendSampleData(struct quartz_vmr *This, VMR9PresentationInfo * return VFW_E_RUNTIME_ERROR; } - TRACE("biSize = %d\n", bmiHeader->biSize); - TRACE("biWidth = %d\n", bmiHeader->biWidth); - TRACE("biHeight = %d\n", bmiHeader->biHeight); - TRACE("biPlanes = %d\n", bmiHeader->biPlanes); - TRACE("biBitCount = %d\n", bmiHeader->biBitCount); - TRACE("biCompression = %s\n", debugstr_an((LPSTR)&(bmiHeader->biCompression), 4)); - TRACE("biSizeImage = %d\n", bmiHeader->biSizeImage); - width = bmiHeader->biWidth; height = bmiHeader->biHeight; @@ -342,7 +334,6 @@ static HRESULT WINAPI VMR9_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TY VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)pmt->pbFormat; This->bmiheader = format->bmiHeader; - TRACE("Resolution: %dx%d\n", format->bmiHeader.biWidth, format->bmiHeader.biHeight); This->VideoWidth = format->bmiHeader.biWidth; This->VideoHeight = format->bmiHeader.biHeight; SetRect(&This->source_rect, 0, 0, This->VideoWidth, This->VideoHeight); @@ -352,8 +343,6 @@ static HRESULT WINAPI VMR9_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TY VIDEOINFOHEADER2 *format = (VIDEOINFOHEADER2 *)pmt->pbFormat; This->bmiheader = format->bmiHeader; - - TRACE("Resolution: %dx%d\n", format->bmiHeader.biWidth, format->bmiHeader.biHeight); This->VideoWidth = format->bmiHeader.biWidth; This->VideoHeight = format->bmiHeader.biHeight; SetRect(&This->source_rect, 0, 0, This->VideoWidth, This->VideoHeight);

1 0

Zebediah Figura : strmbase: Introduce a helper to more thoroughly trace media type.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: b33f05830811b96ad7ff7534383e7007677ac85c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b33f05830811b96ad7ff7534… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 5 19:18:50 2019 -0500 strmbase: Introduce a helper to more thoroughly trace media type. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 110 +++++++++++++++++++++++++++++++++++++++++++--- dlls/strmbase/pin.c | 21 +++------ dlls/strmbase/renderer.c | 4 ++ dlls/strmbase/transform.c | 1 + include/wine/strmbase.h | 2 + 5 files changed, 116 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b33f05830811b96ad7ff…

1 0

Zebediah Figura : strmbase: Introduce a helper to trace reference time.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: a9b87a8216ba62ceee7202fa51ce3644de6dadfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9b87a8216ba62ceee7202fa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 5 19:18:49 2019 -0500 strmbase: 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/strmbase/filter.c | 2 +- dlls/strmbase/pin.c | 6 ++++-- dlls/strmbase/pospass.c | 6 +++--- dlls/strmbase/qualitycontrol.c | 32 ++++++++++++++------------------ dlls/strmbase/renderer.c | 3 ++- dlls/strmbase/strmbase_private.h | 18 ++++++++++++++++++ dlls/strmbase/transform.c | 5 +++-- 7 files changed, 45 insertions(+), 27 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 2de0a78f7a..c9d15e31c7 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -153,7 +153,7 @@ HRESULT WINAPI BaseFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME start) { struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - TRACE("iface %p, start %s.\n", iface, wine_dbgstr_longlong(start)); + TRACE("iface %p, start %s.\n", iface, debugstr_time(start)); EnterCriticalSection(&filter->csFilter); filter->state = State_Running; diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index cc7db119fa..42b150be67 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -346,7 +346,8 @@ HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFER { struct strmbase_pin *This = impl_from_IPin(iface); - TRACE("(%p)->(%s, %s, %e)\n", This, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); + TRACE("iface %p, start %s, stop %s, rate %.16e.\n", + iface, debugstr_time(tStart), debugstr_time(tStop), dRate); This->tStart = tStart; This->tStop = tStop; @@ -858,7 +859,8 @@ HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); newsegmentargs args; - TRACE("(%p)->(%s, %s, %e)\n", This, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); + TRACE("iface %p, start %s, stop %s, rate %.16e.\n", + iface, debugstr_time(tStart), debugstr_time(tStop), dRate); args.tStart = This->pin.tStart = tStart; args.tStop = This->pin.tStop = tStop; diff --git a/dlls/strmbase/pospass.c b/dlls/strmbase/pospass.c index 2c5c274bba..148d4fae3c 100644 --- a/dlls/strmbase/pospass.c +++ b/dlls/strmbase/pospass.c @@ -743,7 +743,7 @@ static HRESULT WINAPI MediaPositionPassThru_put_CurrentPosition(IMediaPosition * IMediaPosition *pos; HRESULT hr; - TRACE("(%s)\n", wine_dbgstr_longlong(llTime)); + TRACE("iface %p, time %.16e.\n", iface, llTime); hr = get_connected(This, &IID_IMediaPosition, (LPVOID*)&pos); if (SUCCEEDED(hr)) { @@ -797,7 +797,7 @@ static HRESULT WINAPI MediaPositionPassThru_put_StopTime(IMediaPosition *iface, IMediaPosition *pos; HRESULT hr; - TRACE("(%s)\n", wine_dbgstr_longlong(llTime)); + TRACE("iface %p, time %.16e.\n", iface, llTime); hr = get_connected(This, &IID_IMediaPosition, (LPVOID*)&pos); if (SUCCEEDED(hr)) { @@ -833,7 +833,7 @@ static HRESULT WINAPI MediaPositionPassThru_put_PrerollTime(IMediaPosition *ifac IMediaPosition *pos; HRESULT hr; - TRACE("(%s)\n", wine_dbgstr_longlong(llTime)); + TRACE("iface %p, time %.16e.\n", iface, llTime); hr = get_connected(This, &IID_IMediaPosition, (LPVOID*)&pos); if (SUCCEEDED(hr)) { diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index 139c4dfe86..b3e93b7baa 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -27,9 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase_qc); -#define XTIME_FMT "%u.%03u" -#define XTIME(u) (int)(u/10000000), (int)((u / 10000)%1000) - HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControlImpl **ppv) { QualityControlImpl *This; @@ -80,9 +77,8 @@ HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *se QualityControlImpl *This = impl_from_IQualityControl(iface); HRESULT hr = S_FALSE; - TRACE("%p %p { 0x%x %u " XTIME_FMT " " XTIME_FMT " }\n", - This, sender, qm.Type, qm.Proportion, - XTIME(qm.Late), XTIME(qm.TimeStamp)); + TRACE("iface %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n", + iface, sender, qm.Type, qm.Proportion, debugstr_time(qm.Late), debugstr_time(qm.TimeStamp)); if (This->tonotify) return IQualityControl_Notify(This->tonotify, This->self, qm); @@ -126,7 +122,6 @@ HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityContro void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart) { - TRACE("%p " XTIME_FMT "\n", This, XTIME(tStart)); This->avg_render = This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; This->clockstart = tStart; This->avg_rate = -1.0; @@ -147,8 +142,8 @@ static BOOL QualityControlRender_IsLate(QualityControlImpl *This, REFERENCE_TIME { REFERENCE_TIME max_lateness = 200000; - TRACE("%p " XTIME_FMT " " XTIME_FMT " " XTIME_FMT "\n", - This, XTIME(jitter), XTIME(start), XTIME(stop)); + TRACE("jitter %s, start %s, stop %s.\n", debugstr_time(jitter), + debugstr_time(start), debugstr_time(stop)); /* we can add a valid stop time */ if (stop >= start) @@ -217,12 +212,12 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) pt = priv->avg_pt; } - TRACE("start: " XTIME_FMT ", entered " XTIME_FMT ", left " XTIME_FMT ", pt: " XTIME_FMT ", " - "duration " XTIME_FMT ", jitter " XTIME_FMT "\n", XTIME(start), XTIME(entered), - XTIME(left), XTIME(pt), XTIME(duration), XTIME(jitter)); + TRACE("start %s, entered %s, left %s, pt %s, duration %s, jitter %s.\n", + debugstr_time(start), debugstr_time(entered), debugstr_time(left), + debugstr_time(pt), debugstr_time(duration), debugstr_time(jitter)); - TRACE("avg_duration: " XTIME_FMT ", avg_pt: " XTIME_FMT ", avg_rate: %g\n", - XTIME(priv->avg_duration), XTIME(priv->avg_pt), priv->avg_rate); + TRACE("average duration %s, average pt %s, average rate %.16e.\n", + debugstr_time(priv->avg_duration), debugstr_time(priv->avg_pt), priv->avg_rate); /* collect running averages. for first observations, we copy the * values */ @@ -274,7 +269,7 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) q.Proportion = 5000; q.Late = priv->current_jitter; q.TimeStamp = priv->current_rstart; - TRACE("Late: %i from %i, rate: %g\n", (int)(q.Late/10000), (int)(q.TimeStamp/10000), 1./priv->avg_rate); + TRACE("Late: %s from %s, rate: %g\n", debugstr_time(q.Late), debugstr_time(q.TimeStamp), 1./priv->avg_rate); hr = IQualityControl_Notify(&priv->IQualityControl_iface, priv->self, q); priv->qos_handled = hr == S_OK; } @@ -302,8 +297,8 @@ void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME s /* FIXME: This isn't correct; we don't drop samples, nor should. */ This->is_dropped = QualityControlRender_IsLate(This, This->current_jitter, start, stop); - TRACE("Dropped: %i %i %i %i\n", This->is_dropped, (int)(start/10000), - (int)(stop/10000), (int)(This->current_jitter / 10000)); + TRACE("dropped %d, start %s, stop %s, jitter %s.\n", This->is_dropped, + debugstr_time(start), debugstr_time(stop), debugstr_time(This->current_jitter)); if (This->is_dropped) This->dropped++; else @@ -313,7 +308,8 @@ void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME s return; IReferenceClock_GetTime(This->clock, &This->start); - TRACE("at: " XTIME_FMT "\n", XTIME(This->start)); + + TRACE("Starting at %s.\n", debugstr_time(This->start)); } void QualityControlRender_EndRender(QualityControlImpl *This) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 7d8420e73c..270a6f260f 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -426,7 +426,8 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface) HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { BaseRenderer *This = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(tStart)); + + TRACE("iface %p, start %s.\n", iface, debugstr_time(tStart)); EnterCriticalSection(&This->csRenderLock); This->stream_start = tStart; diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index 4dd7caa924..d0f5029765 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -32,6 +32,24 @@ #include "wine/list.h" #include "wine/strmbase.h" +static inline const char *debugstr_time(REFERENCE_TIME time) +{ + unsigned int i = 0, j = 0; + char buffer[22], rev[22]; + + while (time || i <= 8) + { + buffer[i++] = '0' + (time % 10); + time /= 10; + if (i == 7) buffer[i++] = '.'; + } + + while (i--) rev[j++] = buffer[i]; + rev[j] = 0; + + return wine_dbg_sprintf("%s", rev); +} + /* Quality Control */ typedef struct QualityControlImpl { IQualityControl IQualityControl_iface; diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index abf5ed34b3..bd70b8a90c 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -254,7 +254,7 @@ static HRESULT WINAPI TransformFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME HRESULT hr = S_OK; TransformFilter *This = impl_from_IBaseFilter(iface); - TRACE("(%p/%p)->(%s)\n", This, iface, wine_dbgstr_longlong(tStart)); + TRACE("iface %p, start %s.\n", iface, debugstr_time(tStart)); EnterCriticalSection(&This->csReceive); { @@ -453,7 +453,8 @@ static HRESULT WINAPI TransformFilter_InputPin_NewSegment(IPin * iface, REFERENC TransformFilter *pTransform = impl_from_sink_IPin(iface); HRESULT hr = S_OK; - TRACE("(%p)->(%s %s %e)\n", iface, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); + TRACE("iface %p, start %s, stop %s, rate %.16e.\n", + iface, debugstr_time(tStart), debugstr_time(tStop), dRate); EnterCriticalSection(&pTransform->filter.csFilter); if (pTransform->pFuncsTable->pfnNewSegment)

1 0

Sven Baars : scrrun/tests: Fix some test failures on Windows 2003.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 673e130c4ff3a904faae4a23829dddaa6ae49864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=673e130c4ff3a904faae4a23… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Oct 5 19:25:00 2019 +0200 scrrun/tests: Fix some test failures on Windows 2003. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index ed49856921..46d452f113 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1897,7 +1897,7 @@ todo_wine lstrcatW(buffW, crlfW); str = NULL; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -1920,7 +1920,7 @@ todo_wine lstrcatW(buffW, L"123"); str = NULL; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -1942,7 +1942,7 @@ todo_wine str = (void*)0xdeadbeef; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); ok(!wcscmp(str, L"123"), "got %s\n", wine_dbgstr_w(str)); ITextStream_Release(stream); @@ -1960,7 +1960,7 @@ todo_wine str = (void*)0xdeadbeef; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); ok(!wcscmp(str, L"test"), "got %s\n", wine_dbgstr_w(str)); ITextStream_Release(stream); @@ -1981,7 +1981,7 @@ todo_wine str = NULL; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); ok(!lstrcmpW(L"test123", str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -2003,7 +2003,7 @@ todo_wine str = (void*)0xdeadbeef; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); ok(!wcscmp(str, L"test string"), "got %s\n", wine_dbgstr_w(str)); ITextStream_Release(stream);

1 0

Zebediah Figura : widl: Also compute buffer size for non-ref arrays.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 8746bf094f87c2cd389e94bd76866f3884fb6b20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8746bf094f87c2cd389e94bd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 4 23:43:36 2019 -0500 widl: Also compute buffer size for non-ref arrays. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47886 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index c4ccd99771..f37c7b0d67 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3865,16 +3865,13 @@ static unsigned int get_required_buffer_size_type( } case TGT_ARRAY: - if (get_pointer_fc(type, attrs, toplevel_param) == FC_RP) + switch (get_array_fc(type)) { - switch (get_array_fc(type)) - { - case FC_SMFARRAY: - case FC_LGFARRAY: - return type_array_get_dim(type) * - get_required_buffer_size_type(type_array_get_element_type(type), name, - NULL, FALSE, alignment); - } + case FC_SMFARRAY: + case FC_LGFARRAY: + return type_array_get_dim(type) * + get_required_buffer_size_type(type_array_get_element_type(type), name, + NULL, FALSE, alignment); } break;

1 0

Zebediah Figura : widl: Write pointer classes for explicitly declared arrays only if they are top-level parameters.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: dd35baa8e326462c1c3ea31b2023e62b2d8f6ee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd35baa8e326462c1c3ea31b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 4 23:43:35 2019 -0500 widl: Write pointer classes for explicitly declared arrays only if they are top-level parameters. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 1ad3e63c6a..c4ccd99771 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3611,7 +3611,8 @@ static unsigned int write_type_tfs(FILE *file, const attr_list_t *attrs, { int ptr_type; ptr_type = get_pointer_fc_context(type, attrs, context); - if (ptr_type != FC_RP || type_array_is_decl_as_ptr(type)) + if (type_array_is_decl_as_ptr(type) + || (ptr_type != FC_RP && context == TYPE_CONTEXT_TOPLEVELPARAM)) { unsigned int absoff = type->typestring_offset; short reloff = absoff - (*typeformat_offset + 2);

1 0

Zebediah Figura : advapi32/tests: Use unique service names in test_wow64().
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: fec26c87ffa9d8efe6cf971e53c69bfceace8c89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fec26c87ffa9d8efe6cf971e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 4 22:02:29 2019 -0500 advapi32/tests: Use unique service names in test_wow64(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47891 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 9dad710490..83c0a9b257 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1806,7 +1806,7 @@ static void test_wow64(void) ok(ret, "Failed to delete service, error %u.\n", GetLastError()); CloseServiceHandle(service); - service = CreateServiceA(manager, "winetestsvc", "winetestsvc", SERVICE_START | DELETE, + service = CreateServiceA(manager, "winetestsvc2", "winetestsvc2", SERVICE_START | DELETE, SERVICE_KERNEL_DRIVER, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, "C:\\windows\\system32\\winetestsvc.exe", NULL, NULL, NULL, NULL, NULL); ok(!!service, "Failed to create service, error %u.\n", GetLastError()); @@ -1825,7 +1825,7 @@ static void test_wow64(void) 0, NULL, CREATE_ALWAYS, 0, NULL); CloseHandle(file); - service = CreateServiceA(manager, "winetestsvc", "winetestsvc", SERVICE_START | DELETE, + service = CreateServiceA(manager, "winetestsvc3", "winetestsvc3", SERVICE_START | DELETE, SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, "C:\\windows\\system32\\winetestsvc.exe service serve", NULL, NULL, NULL, NULL, NULL); ok(!!service, "Failed to create service, error %u.\n", GetLastError()); @@ -1837,7 +1837,7 @@ static void test_wow64(void) ok(ret, "Failed to delete service, error %u.\n", GetLastError()); CloseServiceHandle(service); - service = CreateServiceA(manager, "winetestsvc", "winetestsvc", SERVICE_START | DELETE, + service = CreateServiceA(manager, "winetestsvc4", "winetestsvc4", SERVICE_START | DELETE, SERVICE_KERNEL_DRIVER, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, "C:\\windows\\system32\\winetestsvc.exe", NULL, NULL, NULL, NULL, NULL); ok(!!service, "Failed to create service, error %u.\n", GetLastError());

1 0

Sven Baars : wbemprox: Fix multiple leaks in parse_path (Coverity).
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: a3b6054afb00619254b2b95a1b7b317e541b2685 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3b6054afb00619254b2b95a… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Oct 4 21:58:43 2019 +0200 wbemprox: Fix multiple leaks in parse_path (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/services.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index e1cd2466e4..5909c02e61 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -335,24 +335,42 @@ HRESULT parse_path( const WCHAR *str, struct path **ret ) DWORD server_len = ARRAY_SIZE(server); p++; - if (*p != '\\') return WBEM_E_INVALID_OBJECT_PATH; + if (*p != '\\') + { + heap_free( path ); + return WBEM_E_INVALID_OBJECT_PATH; + } p++; q = p; while (*p && *p != '\\') p++; - if (!*p) return WBEM_E_INVALID_OBJECT_PATH; + if (!*p) + { + heap_free( path ); + return WBEM_E_INVALID_OBJECT_PATH; + } len = p - q; if (!GetComputerNameW( server, &server_len ) || server_len != len || wcsnicmp( q, server, server_len )) + { + heap_free( path ); return WBEM_E_NOT_SUPPORTED; + } q = ++p; while (*p && *p != ':') p++; - if (!*p) return WBEM_E_INVALID_OBJECT_PATH; + if (!*p) + { + heap_free( path ); + return WBEM_E_INVALID_OBJECT_PATH; + } len = p - q; if (len != ARRAY_SIZE(cimv2W) - 1 || wcsnicmp( q, cimv2W, ARRAY_SIZE(cimv2W) - 1 )) + { + heap_free( path ); return WBEM_E_INVALID_NAMESPACE; + } p++; }

1 0

Sven Baars : wbemprox: Fix a leak on error path (Coverity).
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 11470a7763afc1404a830a5ad1c53f65806f5a9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=11470a7763afc1404a830a5a… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Oct 4 21:58:42 2019 +0200 wbemprox: Fix a leak on error path (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 0f7eada9af..f46dcd922f 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -57,7 +57,11 @@ HRESULT create_view( enum view_type type, const WCHAR *path, const struct keywor struct table *table = grab_table( class ); HRESULT hr; - if (table && (hr = append_table( view, table )) != S_OK) return hr; + if (table && (hr = append_table( view, table )) != S_OK) + { + heap_free( view ); + return hr; + } view->proplist = proplist; view->cond = cond; break;

1 0

Sven Baars : wbemprox/tests: Remove some unused variables.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 62a5e16eec17194def60e1f0f89aae46571a3c16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62a5e16eec17194def60e1f0… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Oct 4 21:58:41 2019 +0200 wbemprox/tests: Remove some unused variables. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 1c6ffcaf8d..40eaefee4c 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -750,7 +750,7 @@ static void test_StdRegProv( IWbemServices *services ) {'S','o','f','t','w','a','r','e','\\','S','t','d','R','e','g','P','r','o','v','T','e','s','t',0}; BSTR class = SysAllocString( stdregprovW ), method, name; IWbemClassObject *reg, *sig_in, *sig_out, *in, *out; - VARIANT defkey, subkey, retval, names, types, value, valuename; + VARIANT defkey, subkey, retval, valuename; CIMTYPE type; HRESULT hr; LONG res; @@ -854,7 +854,6 @@ static void test_StdRegProv( IWbemServices *services ) check_property( out, namesW, VT_BSTR|VT_ARRAY, CIM_STRING|CIM_FLAG_ARRAY ); - VariantClear( &names ); VariantClear( &subkey ); IWbemClassObject_Release( in ); IWbemClassObject_Release( out ); @@ -893,8 +892,6 @@ static void test_StdRegProv( IWbemServices *services ) check_property( out, namesW, VT_BSTR|VT_ARRAY, CIM_STRING|CIM_FLAG_ARRAY ); check_property( out, typesW, VT_I4|VT_ARRAY, CIM_SINT32|CIM_FLAG_ARRAY ); - VariantClear( &types ); - VariantClear( &names ); VariantClear( &subkey ); IWbemClassObject_Release( in ); IWbemClassObject_Release( out ); @@ -937,7 +934,6 @@ static void test_StdRegProv( IWbemServices *services ) check_property( out, valueW, VT_BSTR, CIM_STRING ); - VariantClear( &value ); VariantClear( &valuename ); VariantClear( &subkey ); IWbemClassObject_Release( in );

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
62
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 October 2019