March 2008 - Wine-commits - list.winehq.org

Andrew Talbot : winmm: Assign to struct instead of using memcpy.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: d3e904202a8d9a0135482551e194ccf0d75ce98f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3e904202a8d9a0135482551e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 22 17:10:08 2008 +0000 winmm: Assign to struct instead of using memcpy. --- dlls/winmm/mmio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 7b8ea15..fb19bd4 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -936,7 +936,7 @@ MMRESULT WINAPI mmioGetInfo(HMMIO hmmio, MMIOINFO* lpmmioinfo, UINT uFlags) if ((wm = MMIO_Get(hmmio)) == NULL) return MMSYSERR_INVALHANDLE; - memcpy(lpmmioinfo, &wm->info, sizeof(MMIOINFO)); + *lpmmioinfo = wm->info; /* don't expose 16 bit ioproc:s */ if (wm->ioProc->type != MMIO_PROC_16) lpmmioinfo->pIOProc = wm->ioProc->pIOProc;

1 0

Andrew Talbot : wintab32: Assign to structs instead of using memcpy.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: 480cd234a8755efaae448d938fc012d5abc6a1b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=480cd234a8755efaae448d938… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 22 17:10:10 2008 +0000 wintab32: Assign to structs instead of using memcpy. --- dlls/wintab32/context.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 9c4c262..3147ec0 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -214,8 +214,7 @@ LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd) else { TRACE("Placed in queue %p index %i\n",ptr->handle,tgt); - memcpy(&ptr->PacketQueue[tgt], packet, sizeof - (WTPACKET)); + ptr->PacketQueue[tgt] = *packet; ptr->PacketsQueued++; if (ptr->ActiveCursor != packet->pkCursor) @@ -440,7 +439,7 @@ HCTX WINAPI WTOpenW(HWND hWnd, LPLOGCONTEXTW lpLogCtx, BOOL fEnable) DUMPCONTEXT(*lpLogCtx); newcontext = HeapAlloc(GetProcessHeap(), 0 , sizeof(OPENCONTEXT)); - memcpy(&(newcontext->context),lpLogCtx,sizeof(LOGCONTEXTW)); + newcontext->context = *lpLogCtx; newcontext->hwndOwner = hWnd; newcontext->enabled = fEnable; newcontext->ActiveCursor = -1;

1 0

Andrew Talbot : wintrust: Assign to structs instead of using memcpy.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: a1732549cad6478c4f9c1e468c6536674b2984a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1732549cad6478c4f9c1e468… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 22 17:10:13 2008 +0000 wintrust: Assign to structs instead of using memcpy. --- dlls/wintrust/softpub.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 22e6a8c..5e4e086 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -99,8 +99,7 @@ static BOOL SOFTPUB_GetFileSubject(CRYPT_PROVIDER_DATA *data) } else { - memcpy(&data->u.pPDSip->gSubject, - data->pWintrustData->u.pFile->pgKnownSubject, sizeof(GUID)); + data->u.pPDSip->gSubject = *data->pWintrustData->u.pFile->pgKnownSubject; ret = TRUE; } TRACE("returning %d\n", ret); @@ -284,8 +283,7 @@ HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) * add a cert to it */ if (data->pWintrustData->u.pCert->psftVerifyAsOf) - memcpy(&data->sftSystemTime, &signer.sftVerifyAsOf, - sizeof(FILETIME)); + data->sftSystemTime = signer.sftVerifyAsOf; else { SYSTEMTIME sysTime; @@ -394,7 +392,7 @@ static BOOL WINTRUST_SaveSigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) CRYPT_PROVIDER_SGNR sgnr = { sizeof(sgnr), { 0 } }; sgnr.psSigner = signerInfo; - memcpy(&sgnr.sftVerifyAsOf, &data->sftSystemTime, sizeof(FILETIME)); + sgnr.sftVerifyAsOf = data->sftSystemTime; ret = data->psPfns->pfnAddSgnr2Chain(data, FALSE, signerIdx, &sgnr); } else @@ -581,8 +579,7 @@ static void WINTRUST_CreateChainPolicyCreateInfo( { chainPara->cbSize = sizeof(CERT_CHAIN_PARA); if (data->pRequestUsage) - memcpy(&chainPara->RequestedUsage, data->pRequestUsage, - sizeof(CERT_USAGE_MATCH)); + chainPara->RequestedUsage = *data->pRequestUsage; info->u.cbSize = sizeof(WTD_GENERIC_CHAIN_POLICY_CREATE_INFO); info->hChainEngine = NULL; info->pChainPara = chainPara;

1 0

Maarten Lankhorst : quartz: Silence requests for ipin on filters.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: db8b2ca7b49efdf9d021ed7c902ea70d4976f4dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=db8b2ca7b49efdf9d021ed7c9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Mar 21 15:36:51 2008 -0700 quartz: Silence requests for ipin on filters. --- dlls/quartz/dsoundrender.c | 3 ++- dlls/quartz/filesource.c | 6 ++++-- dlls/quartz/nullrenderer.c | 3 ++- dlls/quartz/parser.c | 3 ++- dlls/quartz/transform.c | 3 ++- dlls/quartz/videorenderer.c | 3 ++- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 5cb1f61..39fc1bc 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -382,7 +382,8 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri return S_OK; } - FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); + if (!IsEqualIID(riid, &IID_IPin)) + FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index f30a3ad..c75f9a2 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -393,7 +393,8 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii return S_OK; } - FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IMediaSeeking)) + FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE; } @@ -792,7 +793,8 @@ static HRESULT WINAPI FileAsyncReaderPin_QueryInterface(IPin * iface, REFIID rii return S_OK; } - FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IMediaSeeking)) + FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index 2f663a4..d494ca5 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -219,7 +219,8 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown * iface, REFIID return S_OK; } - FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); + if (!IsEqualIID(riid, &IID_IPin)) + FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 17861a0..8fdf939 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -159,7 +159,8 @@ static HRESULT WINAPI Parser_QueryInterface(IBaseFilter * iface, REFIID riid, LP return S_OK; } - FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); + if (!IsEqualIID(riid, &IID_IPin)) + FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 0570a90..ccbca58 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -220,7 +220,8 @@ static HRESULT WINAPI TransformFilter_QueryInterface(IBaseFilter * iface, REFIID return S_OK; } - FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); + if (!IsEqualIID(riid, &IID_IPin)) + FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index ec16a4c..49aae1e 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -523,7 +523,8 @@ static HRESULT WINAPI VideoRendererInner_QueryInterface(IUnknown * iface, REFIID return S_OK; } - FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); + if (!IsEqualIID(riid, &IID_IPin)) + FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE; }

1 0

Andrew Talbot : wnaspi32: Assign to struct instead of using memcpy.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: d0986ac5adb6ad8cdb3bd93c5c5e2212d924da66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0986ac5adb6ad8cdb3bd93c5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 22 17:10:16 2008 +0000 wnaspi32: Assign to struct instead of using memcpy. --- dlls/wnaspi32/winaspi32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c index 438b2a1..36a9202 100644 --- a/dlls/wnaspi32/winaspi32.c +++ b/dlls/wnaspi32/winaspi32.c @@ -541,7 +541,7 @@ DWORD __cdecl SendASPI32Command(LPSRB lpSRB) memset(&tmpsrb,0,sizeof(tmpsrb)); /* Copy header */ - memcpy(&tmpsrb.common,&(lpSRB->common),sizeof(tmpsrb.common)); + tmpsrb.common = lpSRB->common; tmpsrb.cmd.SRB_Flags |= 8; /* target to host */ tmpsrb.cmd.SRB_Cmd = SC_EXEC_SCSI_CMD;

1 0

Maarten Lankhorst : quartz: Play silence in directsound renderer on end of stream notification.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: 17a1c646869784f3cdeef1f976c35801b13f6f7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=17a1c646869784f3cdeef1f97… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Mar 21 14:56:40 2008 -0700 quartz: Play silence in directsound renderer on end of stream notification. --- dlls/quartz/dsoundrender.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index ec1b9fe..5cb1f61 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -252,7 +252,6 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) ERR("Cannot get sample time (%x)\n", hr); cbSrcStream = IMediaSample_GetActualDataLength(pSample); - TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, cbSrcStream); #if 0 /* For debugging purpose */ @@ -796,15 +795,26 @@ static HRESULT WINAPI DSoundRender_InputPin_Disconnect(IPin * iface) static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) { InputPin* This = (InputPin*)iface; + DSoundRenderImpl *me = (DSoundRenderImpl*)This->pin.pinInfo.pFilter; IMediaEventSink* pEventSink; HRESULT hr; TRACE("(%p/%p)->()\n", This, iface); + InputPin_EndOfStream(iface); - hr = IFilterGraph_QueryInterface(((DSoundRenderImpl*)This->pin.pinInfo.pFilter)->filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); + hr = IFilterGraph_QueryInterface(me->filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); if (SUCCEEDED(hr)) { - /* FIXME: We should wait that all audio data has been played */ + BYTE * silence; + + silence = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, me->buf_size); + if (silence) + { + memset(silence, 0, me->buf_size); + DSoundRender_SendSampleData((DSoundRenderImpl*)This->pin.pinInfo.pFilter, silence, me->buf_size); + HeapFree(GetProcessHeap(), 0, silence); + } + hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, 0); IMediaEventSink_Release(pEventSink); }

1 0

Maarten Lankhorst : quartz: Forward requests for MediaSeeking from all pins properly.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: 4d745e0051e56de36deec70e3fbd80055733a7db URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d745e0051e56de36deec70e3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Mar 21 16:12:54 2008 -0700 quartz: Forward requests for MediaSeeking from all pins properly. --- dlls/quartz/parser.c | 2 +- dlls/quartz/pin.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 868c625..17861a0 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -628,7 +628,7 @@ static HRESULT WINAPI Parser_OutputPin_QueryInterface(IPin * iface, REFIID riid, *ppv = (LPVOID)iface; else if (IsEqualIID(riid, &IID_IMediaSeeking)) { - return IBaseFilter_QueryInterface((IBaseFilter*)&This->pin.pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); + return IBaseFilter_QueryInterface(This->pin.pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); } if (*ppv) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 878f53a..e8d0f44 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -507,6 +507,10 @@ HRESULT WINAPI InputPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) *ppv = (LPVOID)iface; else if (IsEqualIID(riid, &IID_IMemInputPin)) *ppv = (LPVOID)&This->lpVtblMemInput; + else if (IsEqualIID(riid, &IID_IMediaSeeking)) + { + return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); + } if (*ppv) { @@ -803,6 +807,10 @@ HRESULT WINAPI OutputPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) *ppv = (LPVOID)iface; else if (IsEqualIID(riid, &IID_IPin)) *ppv = (LPVOID)iface; + else if (IsEqualIID(riid, &IID_IMediaSeeking)) + { + return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); + } if (*ppv) { @@ -1279,6 +1287,10 @@ HRESULT WINAPI PullPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) *ppv = (LPVOID)iface; else if (IsEqualIID(riid, &IID_IPin)) *ppv = (LPVOID)iface; + else if (IsEqualIID(riid, &IID_IMediaSeeking)) + { + return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); + } if (*ppv) {

1 0

Maarten Lankhorst : quartz: Make acmwrapper code aware of time, and get rid of its internal buffer.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: f8bb8384555c7d03376ad2af9bbc196f631ea89e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8bb8384555c7d03376ad2af9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Mar 21 14:55:03 2008 -0700 quartz: Make acmwrapper code aware of time, and get rid of its internal buffer. --- dlls/quartz/acmwrapper.c | 75 +++++++++++++++++++--------------------------- 1 files changed, 31 insertions(+), 44 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index de90b81..4d5fbc9 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -41,19 +41,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -/* FIXME: Improve buffers management */ -#define OUTPUT_BUFFER_SIZE 15000 -#define INPUT_BUFFER_SIZE 4096 - typedef struct ACMWrapperImpl { TransformFilterImpl tf; HACMSTREAM has; LPWAVEFORMATEX pWfIn; LPWAVEFORMATEX pWfOut; - BYTE buffer[INPUT_BUFFER_SIZE]; - DWORD max_size; - DWORD current_size; BOOL reinit_codec; /* FIXME: Should use sync points instead */ } ACMWrapperImpl; @@ -62,16 +55,14 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte ACMWrapperImpl* This = (ACMWrapperImpl*)pTransformFilter; AM_MEDIA_TYPE amt; IMediaSample* pOutSample = NULL; - DWORD cbDstStream; + DWORD cbDstStream, cbSrcStream; LPBYTE pbDstStream; - DWORD cbSrcStream = 0; LPBYTE pbSrcStream = NULL; ACMSTREAMHEADER ash; - DWORD offset = 0; - BOOL stop = FALSE; BOOL unprepare_header = FALSE; MMRESULT res; HRESULT hr; + LONGLONG tStart = -1, tStop = -1, tMed; hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) @@ -80,6 +71,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte return hr; } + IMediaSample_GetTime(pSample, &tStart, &tStop); cbSrcStream = IMediaSample_GetActualDataLength(pSample); TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, (long)cbSrcStream); @@ -90,21 +82,11 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte return hr; } - while(hr == S_OK && !stop) + ash.pbSrc = pbSrcStream; + ash.cbSrcLength = cbSrcStream; + + while(hr == S_OK && ash.cbSrcLength) { - DWORD rem_buf = This->max_size - This->current_size; - DWORD rem_smp = cbSrcStream - offset; - DWORD copy_size = min(rem_buf, rem_smp); - - memcpy(This->buffer + This->current_size, pbSrcStream + offset, copy_size); - This->current_size += copy_size; - offset += copy_size; - - if (offset >= cbSrcStream) - stop = TRUE; - if (This->current_size < This->max_size) - break; - hr = OutputPin_GetDeliveryBuffer((OutputPin*)This->tf.ppPins[1], &pOutSample, NULL, NULL, 0); if (FAILED(hr)) { ERR("Unable to get delivery buffer (%x)\n", hr); @@ -124,8 +106,6 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte ash.cbStruct = sizeof(ash); ash.fdwStatus = 0; ash.dwUser = 0; - ash.pbSrc = This->buffer; - ash.cbSrcLength = This->current_size; ash.pbDst = pbDstStream; ash.cbDstLength = cbDstStream; @@ -133,7 +113,6 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte ERR("Cannot prepare header %d\n", res); goto error; } - unprepare_header = TRUE; if ((res = acmStreamConvert(This->has, &ash, This->reinit_codec ? ACM_STREAMCONVERTF_START : 0))) { @@ -143,17 +122,31 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte } This->reinit_codec = FALSE; - TRACE("used in %u, used out %u\n", ash.cbSrcLengthUsed, ash.cbDstLengthUsed); + TRACE("used in %u/%u, used out %u/%u\n", ash.cbSrcLengthUsed, ash.cbSrcLength, ash.cbDstLengthUsed, ash.cbDstLength); hr = IMediaSample_SetActualDataLength(pOutSample, ash.cbDstLengthUsed); assert(hr == S_OK); - if (ash.cbSrcLengthUsed < ash.cbSrcLength) { - This->current_size = ash.cbSrcLength - ash.cbSrcLengthUsed; - memmove(This->buffer, This->buffer + ash.cbSrcLengthUsed, This->current_size); - } - else - This->current_size = 0; + assert(ash.cbSrcLengthUsed); + TRACE("Sample start time: %lld.%03lld\n", (tStart/10000000), (tStart/10000)%1000); + if (ash.cbSrcLengthUsed == cbSrcStream) + { + IMediaSample_SetTime(pOutSample, &tStart, &tStop); + tStart = tStop; + } + else if (tStop != tStart) + { + tMed = tStop - tStart; + tMed = tStart + tMed * ash.cbSrcLengthUsed / cbSrcStream; + IMediaSample_SetTime(pOutSample, &tStart, &tMed); + tStart = tMed; + } + else + { + ERR("No valid timestamp found\n"); + IMediaSample_SetTime(pOutSample, NULL, NULL); + } + TRACE("Sample stop time: %lld.%03lld\n", (tStart/10000000), (tStart/10000)%1000); hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pOutSample); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) { @@ -166,6 +159,8 @@ error: if (unprepare_header && (res = acmStreamUnprepareHeader(This->has, &ash, 0))) ERR("Cannot unprepare header %d\n", res); unprepare_header = FALSE; + ash.pbSrc += ash.cbSrcLengthUsed; + ash.cbSrcLength -= ash.cbSrcLengthUsed; if (pOutSample) IMediaSample_Release(pOutSample); @@ -210,16 +205,8 @@ static HRESULT ACMWrapper_ConnectInput(TransformFilterImpl* pTransformFilter, co { This->has = drv; - if ((res = acmStreamSize(drv, OUTPUT_BUFFER_SIZE, &This->max_size, ACM_STREAMSIZEF_DESTINATION))) { - ERR("Cannot retrieve input buffer size error %d!\n", res); - This->max_size = INPUT_BUFFER_SIZE; - } - - TRACE("input buffer size %d\n", This->max_size); - /* Update buffer size of media samples in output */ - ((OutputPin*)This->tf.ppPins[1])->allocProps.cbBuffer = OUTPUT_BUFFER_SIZE; - + ((OutputPin*)This->tf.ppPins[1])->allocProps.cbBuffer = This->pWfOut->nAvgBytesPerSec / 2; TRACE("Connection accepted\n"); return S_OK; }

1 0

Maarten Lankhorst : quartz: Add sanity check to mediaseeking setrate.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: c423511d2ee5d3ece6c91286109c91030dfd258a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c423511d2ee5d3ece6c912861… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Mar 21 14:54:33 2008 -0700 quartz: Add sanity check to mediaseeking setrate. --- dlls/quartz/control.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index 6b22bf4..d32d054 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -426,6 +426,12 @@ HRESULT WINAPI MediaSeekingImpl_SetRate(IMediaSeeking * iface, double dRate) TRACE("(%e)\n", dRate); + if (dRate > 100 || dRate < .001) + { + FIXME("Excessive rate %e, ignoring\n", dRate); + return VFW_E_UNSUPPORTED_AUDIO; + } + EnterCriticalSection(This->crst); This->dRate = dRate; if (bChangeRate)

1 0

Maarten Lankhorst : quartz: Parse audio packets in mpeg splitter to obtain the duration.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: b0c6a34358b5f2f9e1111f426dbeee4ef22a8d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0c6a34358b5f2f9e1111f426… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Mar 20 22:33:47 2008 -0700 quartz: Parse audio packets in mpeg splitter to obtain the duration. --- dlls/quartz/mpegsplit.c | 460 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 312 insertions(+), 148 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0c6a34358b5f2f9e1111…

1 0