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

Maarten Lankhorst : quartz: Add seeking to mpeg splitter.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 553fe8565df83e3dc024841fdb2354ce088386cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=553fe8565df83e3dc024841fd… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 1 14:43:09 2008 -0700 quartz: Add seeking to mpeg splitter. --- dlls/quartz/mpegsplit.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 79 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 0185b80..fcd0a5c 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -737,6 +737,84 @@ static HRESULT MPEGSplitter_cleanup(LPVOID iface) return S_OK; } +static HRESULT MPEGSplitter_seek(IBaseFilter *iface) +{ + MPEGSplitterImpl *This = (MPEGSplitterImpl*)iface; + PullPin *pPin = This->Parser.pInputPin; + LONGLONG newpos, timepos, bytepos; + HRESULT hr = S_OK; + BYTE header[4]; + + /* Position, in bytes */ + bytepos = This->header_bytes; + + /* Position, in media time, current and new */ + timepos = 0; + newpos = This->Parser.mediaSeeking.llCurrent; + + if (newpos > This->duration) + { + FIXME("Requesting position %x%08x beyond end of stream %x%08x\n", (DWORD)(newpos>>32), (DWORD)newpos, (DWORD)(This->duration>>32), (DWORD)This->duration); + return E_INVALIDARG; + } + + if (This->position/1000000 == newpos/1000000) + { + FIXME("Requesting position %x%08x same as current position %x%08x\n", (DWORD)(newpos>>32), (DWORD)newpos, (DWORD)(This->position>>32), (DWORD)This->position); + return S_OK; + } + + hr = IAsyncReader_SyncRead(pPin->pReader, bytepos, 4, header); + + while (bytepos < This->EndOfFile && SUCCEEDED(hr)) + { + LONGLONG length = 0; + hr = IAsyncReader_SyncRead(pPin->pReader, bytepos, 4, header); + while (parse_header(header, &length, &timepos)) + { + /* No valid header yet; shift by a byte and check again */ + memmove(header, header+1, 3); + hr = IAsyncReader_SyncRead(pPin->pReader, ++bytepos, 1, header + 3); + if (FAILED(hr)) + break; + } + bytepos += length; + TRACE("Pos: %x%08x/%x%08x\n", (DWORD)(bytepos >> 32), (DWORD)bytepos, (DWORD)(This->EndOfFile>>32), (DWORD)This->EndOfFile); + if (timepos >= newpos) + break; + } + if (SUCCEEDED(hr)) + { + FILTER_STATE state; + PullPin *pin = This->Parser.pInputPin; + + TRACE("Moving sound to %x%08x bytes!\n", (DWORD)(bytepos>>32), (DWORD)bytepos); + + IPin_BeginFlush((IPin *)pin); + IPin_NewSegment((IPin*)pin, newpos, This->duration, pin->dRate); + IPin_EndFlush((IPin *)pin); + + /* Make sure this is done while stopped */ + EnterCriticalSection(&This->Parser.csFilter); + pin->rtStart = pin->rtCurrent = MEDIATIME_FROM_BYTES(bytepos); + pin->rtStop = MEDIATIME_FROM_BYTES((REFERENCE_TIME)This->EndOfFile); + This->seek = TRUE; + This->skipbytes = This->remaining_bytes = 0; + This->position = newpos; + if (This->pCurrentSample) + { + IMediaSample_Release(This->pCurrentSample); + This->pCurrentSample = NULL; + } + state = This->Parser.state; + LeaveCriticalSection(&This->Parser.csFilter); + + if (state == State_Running && pin->state == State_Paused) + PullPin_StartProcessing(pin); + + } + return hr; +} HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) { @@ -755,7 +833,7 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) return E_OUTOFMEMORY; ZeroMemory(This, sizeof(MPEGSplitterImpl)); - hr = Parser_Create(&(This->Parser), &CLSID_MPEG1Splitter, MPEGSplitter_process_sample, MPEGSplitter_query_accept, MPEGSplitter_pre_connect, MPEGSplitter_cleanup, NULL, NULL, NULL); + hr = Parser_Create(&(This->Parser), &CLSID_MPEG1Splitter, MPEGSplitter_process_sample, MPEGSplitter_query_accept, MPEGSplitter_pre_connect, MPEGSplitter_cleanup, NULL, MPEGSplitter_seek, NULL); if (FAILED(hr)) { CoTaskMemFree(This);

1 0

Maarten Lankhorst : quartz: Prepare mpeg splitter code for seeking by making most splitter parsing locked .
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: b1b75243d494da501f13c6cb213ff91255853ad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1b75243d494da501f13c6cb2… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 1 14:42:32 2008 -0700 quartz: Prepare mpeg splitter code for seeking by making most splitter parsing locked. --- dlls/quartz/mpegsplit.c | 91 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 63 insertions(+), 28 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 0dbc3c5..0185b80 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -60,7 +60,9 @@ typedef struct MPEGSplitterImpl LONGLONG duration; LONGLONG position; DWORD skipbytes; + DWORD header_bytes; DWORD remaining_bytes; + BOOL seek; } MPEGSplitterImpl; static int MPEGSplitter_head_check(const BYTE *header) @@ -115,7 +117,7 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) ((header[1]>>1)&0x3) != 0 && ((header[2]>>4)&0xf) != 0xf && ((header[2]>>2)&0x3) != 0x3)) { - WARN("Not a valid header: %02x:%02x\n", header[0], header[1]); + FIXME("Not a valid header: %02x:%02x\n", header[0], header[1]); return E_INVALIDARG; } @@ -132,6 +134,13 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) emphasis = ((header[3]>>0)&0x3); bitrate = tabsel_123[lsf][layer-1][bitrate_index] * 1000; + if (!bitrate || layer != 3) + { + ERR("Not a valid header: %02x:%02x:%02x:%02x\n", header[0], header[1], header[2], header[3]); + return E_INVALIDARG; + } + + if (layer == 3 || layer == 2) length = 144 * bitrate / freqs[freq_index] + padding; else @@ -173,7 +182,7 @@ static HRESULT copy_data(IMediaSample *to, BYTE** from, DWORD *flen, DWORD amoun return hr; } -static HRESULT FillBuffer(MPEGSplitterImpl *This, BYTE** fbuf, DWORD *flen) +static HRESULT FillBuffer(MPEGSplitterImpl *This, BYTE** fbuf, DWORD *flen, IMediaSample *pCurrentSample) { Parser_OutputPin * pOutputPin = (Parser_OutputPin*)This->Parser.ppPins[1]; LONGLONG length = 0; @@ -197,11 +206,11 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, BYTE** fbuf, DWORD *flen) { DWORD towrite = min(This->remaining_bytes, *flen); - hr = copy_data(This->pCurrentSample, fbuf, flen, towrite); + hr = copy_data(pCurrentSample, fbuf, flen, towrite); if (FAILED(hr)) { WARN("Could not resize sample: %08x\n", hr); - goto release; + return hr; } This->remaining_bytes -= towrite; @@ -213,7 +222,7 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, BYTE** fbuf, DWORD *flen) } /* Special case, last source sample might (or might not have) had a header, and now we want to retrieve it */ - dlen = IMediaSample_GetActualDataLength(This->pCurrentSample); + dlen = IMediaSample_GetActualDataLength(pCurrentSample); if (dlen > 0 && dlen < 4) { BYTE *header = NULL; @@ -222,15 +231,15 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, BYTE** fbuf, DWORD *flen) /* Shoot anyone with a small sample! */ assert(*flen >= 6); - hr = IMediaSample_GetPointer(This->pCurrentSample, &header); + hr = IMediaSample_GetPointer(pCurrentSample, &header); if (SUCCEEDED(hr)) - hr = IMediaSample_SetActualDataLength(This->pCurrentSample, 7); + hr = IMediaSample_SetActualDataLength(pCurrentSample, 7); if (FAILED(hr)) { WARN("Could not resize sample: %08x\n", hr); - goto release; + return hr; } memcpy(header + dlen, *fbuf, 6 - dlen); @@ -243,12 +252,12 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, BYTE** fbuf, DWORD *flen) /* No header found */ if (attempts == dlen) { - hr = IMediaSample_SetActualDataLength(This->pCurrentSample, 0); + hr = IMediaSample_SetActualDataLength(pCurrentSample, 0); return hr; } - IMediaSample_SetActualDataLength(This->pCurrentSample, 4); - IMediaSample_SetTime(This->pCurrentSample, &time, &This->position); + IMediaSample_SetActualDataLength(pCurrentSample, 4); + IMediaSample_SetTime(pCurrentSample, &time, &This->position); /* Move header back to beginning */ if (attempts) @@ -274,21 +283,21 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, BYTE** fbuf, DWORD *flen) if (*flen < 4) { assert(!length); - hr = copy_data(This->pCurrentSample, fbuf, flen, *flen); + hr = copy_data(pCurrentSample, fbuf, flen, *flen); return hr; } - IMediaSample_SetTime(This->pCurrentSample, &time, &This->position); + IMediaSample_SetTime(pCurrentSample, &time, &This->position); if (*flen < length) { /* Partial copy: Copy 4 bytes, the rest will be copied by the logic for This->remaining_bytes */ This->remaining_bytes = length - 4; - copy_data(This->pCurrentSample, fbuf, flen, 4); + copy_data(pCurrentSample, fbuf, flen, 4); return hr; } - hr = copy_data(This->pCurrentSample, fbuf, flen, length); + hr = copy_data(pCurrentSample, fbuf, flen, length); if (FAILED(hr)) { WARN("Couldn't set data size to %x%08x\n", (DWORD)(length >> 32), (DWORD)length); @@ -306,21 +315,33 @@ out_append: if (length > *flen) break; - if (FAILED(copy_data(This->pCurrentSample, fbuf, flen, length))) + if (FAILED(copy_data(pCurrentSample, fbuf, flen, length))) break; This->position += sampleduration; sampleduration = 0; - IMediaSample_SetTime(This->pCurrentSample, &time, &This->position); + IMediaSample_SetTime(pCurrentSample, &time, &This->position); } TRACE("Media time: %u.%03u\n", (DWORD)(This->position/10000000), (DWORD)((This->position/10000)%1000)); - hr = OutputPin_SendSample(&pOutputPin->pin, This->pCurrentSample); + IMediaSample_AddRef(pCurrentSample); + LeaveCriticalSection(&This->Parser.csFilter); + + hr = OutputPin_SendSample(&pOutputPin->pin, pCurrentSample); + + EnterCriticalSection(&This->Parser.csFilter); + IMediaSample_Release(pCurrentSample); + if (FAILED(hr)) + { WARN("Error sending sample (%x)\n", hr); -release: - IMediaSample_Release(This->pCurrentSample); - This->pCurrentSample = NULL; + return hr; + } + if (This->pCurrentSample) + { + IMediaSample_Release(pCurrentSample); + This->pCurrentSample = NULL; + } return hr; } @@ -346,6 +367,7 @@ static HRESULT MPEGSplitter_process_sample(LPVOID iface, IMediaSample * pSample) /* trace removed for performance reasons */ /* TRACE("(%p), %llu -> %llu\n", pSample, tStart, tStop); */ + EnterCriticalSection(&This->Parser.csFilter); /* Now, try to find a new header */ while (cbSrcStream > 0) { @@ -361,16 +383,16 @@ static HRESULT MPEGSplitter_process_sample(LPVOID iface, IMediaSample * pSample) if (FAILED(hr = IMediaSample_SetActualDataLength(This->pCurrentSample, 0))) goto fail; IMediaSample_SetSyncPoint(This->pCurrentSample, TRUE); + IMediaSample_SetDiscontinuity(This->pCurrentSample, This->seek); + This->seek = FALSE; } - hr = FillBuffer(This, &pbSrcStream, &cbSrcStream); - if (SUCCEEDED(hr)) { - if (hr == S_FALSE) - break; + hr = FillBuffer(This, &pbSrcStream, &cbSrcStream, This->pCurrentSample); + if (SUCCEEDED(hr) && hr != S_FALSE) continue; - } fail: - FIXME("Failed with hres: %08x!\n", hr); + if (hr != S_FALSE) + FIXME("Failed with hres: %08x!\n", hr); This->skipbytes += This->remaining_bytes; This->remaining_bytes = 0; if (This->pCurrentSample) @@ -379,6 +401,7 @@ fail: IMediaSample_Release(This->pCurrentSample); This->pCurrentSample = NULL; } + break; } if (BYTES_FROM_MEDIATIME(tStop) >= This->EndOfFile) @@ -416,6 +439,7 @@ fail: hr = S_FALSE; } + LeaveCriticalSection(&This->Parser.csFilter); return hr; } @@ -612,7 +636,7 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin) if (FAILED(hr)) return hr; pos -= 4; - This->skipbytes = pos; + This->header_bytes = This->skipbytes = pos; switch(streamtype) { @@ -671,6 +695,7 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin) hr = S_OK; TRACE("Duration: %d seconds\n", (DWORD)(duration / 10000000)); TRACE("Parsing took %u ms\n", GetTickCount() - ticks); + This->duration = duration; break; } case MPEG_VIDEO_HEADER: @@ -701,9 +726,18 @@ static HRESULT MPEGSplitter_cleanup(LPVOID iface) IMediaSample_Release(This->pCurrentSample); This->pCurrentSample = NULL; + if (This->Parser.pInputPin && !This->seek) + { + This->skipbytes += This->remaining_bytes; + This->Parser.pInputPin->rtCurrent += MEDIATIME_FROM_BYTES(This->skipbytes); + } + if (!This->seek) + This->skipbytes = This->remaining_bytes = 0; + return S_OK; } + HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) { MPEGSplitterImpl *This; @@ -727,6 +761,7 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) CoTaskMemFree(This); return hr; } + This->seek = TRUE; /* Note: This memory is managed by the parser filter once created */ *ppv = (LPVOID)This;

1 0

Maarten Lankhorst : quartz: Implement filtergraph mediaseeking setposition.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 855e3a08b527f38bbc1b996982f6c8693c48b039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=855e3a08b527f38bbc1b99698… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 1 14:07:38 2008 -0700 quartz: Implement filtergraph mediaseeking setposition. --- dlls/quartz/filtergraph.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 5fd6a95..0a841d9 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2015,16 +2015,50 @@ static HRESULT WINAPI MediaSeeking_ConvertTimeFormat(IMediaSeeking *iface, return S_OK; } +struct pos_args { + LONGLONG* current, *stop; + DWORD curflags, stopflags; +}; + +static HRESULT WINAPI found_setposition(IFilterGraphImpl *This, IMediaSeeking *seek, DWORD_PTR pargs) +{ + struct pos_args *args = (void*)pargs; + + return IMediaSeeking_SetPositions(seek, args->current, args->curflags, args->stop, args->stopflags); +} + static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG *pCurrent, DWORD dwCurrentFlags, LONGLONG *pStop, DWORD dwStopFlags) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaSeeking_vtbl, iface); + HRESULT hr = S_OK; + FILTER_STATE state; + struct pos_args args; - FIXME("(%p/%p)->(%p, %08x, %p, %08x): stub !!!\n", This, iface, pCurrent, dwCurrentFlags, pStop, dwStopFlags); + TRACE("(%p/%p)->(%p, %08x, %p, %08x)\n", This, iface, pCurrent, dwCurrentFlags, pStop, dwStopFlags); - return S_OK; + EnterCriticalSection(&This->cs); + state = This->state; + TRACE("State: %s\n", state == State_Running ? "Running" : (state == State_Paused ? "Paused" : (state == State_Stopped ? "Stopped" : "UNKNOWN"))); + + if ((dwCurrentFlags & 0x7) == AM_SEEKING_AbsolutePositioning) + This->position = *pCurrent; + else if ((dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning) + FIXME("Adjust method %x not handled yet!\n", dwCurrentFlags & 0x7); + + if ((dwStopFlags & 0x7) != AM_SEEKING_NoPositioning) + FIXME("Stop position not handled yet!\n"); + + args.current = pCurrent; + args.stop = pStop; + args.curflags = dwCurrentFlags; + args.stopflags = dwStopFlags; + hr = all_renderers_seek(This, found_setposition, (DWORD_PTR)&args); + LeaveCriticalSection(&This->cs); + + return hr; } static HRESULT WINAPI MediaSeeking_GetPositions(IMediaSeeking *iface,

1 0

Maarten Lankhorst : quartz: Fix parser and pins logic to no longer deadlock .
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 0e9ed6b402c6d7a49be736623d7e2bcf649d270b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e9ed6b402c6d7a49be736623… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 1 14:35:14 2008 -0700 quartz: Fix parser and pins logic to no longer deadlock. --- dlls/quartz/parser.c | 14 +++-- dlls/quartz/pin.c | 108 +++++++++++++++++++++++++++------------ dlls/quartz/pin.h | 4 +- dlls/quartz/tests/filtergraph.c | 11 ++++ 4 files changed, 97 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e9ed6b402c6d7a49be73…

1 0

Maarten Lankhorst : quartz: Fix locking in MediaSeeking and forward SetPosition.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 4b5d06d30f681c95743f5f80f7f898946611c9b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b5d06d30f681c95743f5f80f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 1 13:56:28 2008 -0700 quartz: Fix locking in MediaSeeking and forward SetPosition. Don't hold locks while forwarding messages, instead rely on the reference count. This prevents some really fun deadlocks from occuring. --- dlls/quartz/control.c | 48 ++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 38 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index 6e5cb0d..af6de28 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef HRESULT (*SeekFunc)( IMediaSeeking *to, LPVOID arg ); -static HRESULT ForwardCmdSeek( IBaseFilter* from, SeekFunc fnSeek, LPVOID arg ) +static HRESULT ForwardCmdSeek( PCRITICAL_SECTION crit_sect, IBaseFilter* from, SeekFunc fnSeek, LPVOID arg ) { HRESULT hr = S_OK; HRESULT hr_return = S_OK; @@ -71,7 +71,9 @@ static HRESULT ForwardCmdSeek( IBaseFilter* from, SeekFunc fnSeek, LPVOID arg ) if (!hr_local) { foundend = TRUE; + LeaveCriticalSection( crit_sect ); hr_local = fnSeek( seek , arg ); + EnterCriticalSection( crit_sect ); if (hr_local != E_NOTIMPL) allnotimpl = FALSE; @@ -90,7 +92,7 @@ static HRESULT ForwardCmdSeek( IBaseFilter* from, SeekFunc fnSeek, LPVOID arg ) hr = hr_return; out: - FIXME("Returning: %08x\n", hr); + TRACE("Returning: %08x\n", hr); return hr; } @@ -148,7 +150,9 @@ HRESULT WINAPI MediaSeekingImpl_CheckCapabilities(IMediaSeeking * iface, DWORD * if (!pCapabilities) return E_POINTER; - hr = ForwardCmdSeek(This->pUserData, fwd_checkcaps, pCapabilities); + EnterCriticalSection(This->crst); + hr = ForwardCmdSeek(This->crst, This->pUserData, fwd_checkcaps, pCapabilities); + LeaveCriticalSection(This->crst); if (FAILED(hr) && hr != E_NOTIMPL) return hr; @@ -217,7 +221,9 @@ HRESULT WINAPI MediaSeekingImpl_SetTimeFormat(IMediaSeeking * iface, const GUID MediaSeekingImpl *This = (MediaSeekingImpl *)iface; TRACE("(%s)\n", qzdebugstr_guid(pFormat)); - ForwardCmdSeek(This->pUserData, fwd_settimeformat, (LPVOID)pFormat); + EnterCriticalSection(This->crst); + ForwardCmdSeek(This->crst, This->pUserData, fwd_settimeformat, (LPVOID)pFormat); + LeaveCriticalSection(This->crst); return (IsEqualIID(pFormat, &TIME_FORMAT_MEDIA_TIME) ? S_OK : S_FALSE); } @@ -246,7 +252,7 @@ HRESULT WINAPI MediaSeekingImpl_GetDuration(IMediaSeeking * iface, LONGLONG * pD EnterCriticalSection(This->crst); *pDuration = This->llDuration; - ForwardCmdSeek(This->pUserData, fwd_getduration, pDuration); + ForwardCmdSeek(This->crst, This->pUserData, fwd_getduration, pDuration); LeaveCriticalSection(This->crst); return S_OK; @@ -276,7 +282,7 @@ HRESULT WINAPI MediaSeekingImpl_GetStopPosition(IMediaSeeking * iface, LONGLONG EnterCriticalSection(This->crst); *pStop = This->llStop; - ForwardCmdSeek(This->pUserData, fwd_getstopposition, pStop); + ForwardCmdSeek(This->crst, This->pUserData, fwd_getstopposition, pStop); LeaveCriticalSection(This->crst); return S_OK; @@ -307,7 +313,7 @@ HRESULT WINAPI MediaSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGLO EnterCriticalSection(This->crst); *pCurrent = This->llCurrent; - ForwardCmdSeek(This->pUserData, fwd_getcurposition, pCurrent); + ForwardCmdSeek(This->crst, This->pUserData, fwd_getcurposition, pCurrent); LeaveCriticalSection(This->crst); return S_OK; @@ -341,14 +347,33 @@ static inline LONGLONG Adjust(LONGLONG value, const LONGLONG * pModifier, DWORD } } +struct pos_args { + LONGLONG* current, *stop; + DWORD curflags, stopflags; +}; + +static HRESULT fwd_setposition(IMediaSeeking *seek, LPVOID pargs) +{ + struct pos_args *args = (void*)pargs; + + return IMediaSeeking_SetPositions(seek, args->current, args->curflags, args->stop, args->stopflags); +} + + HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * pCurrent, DWORD dwCurrentFlags, LONGLONG * pStop, DWORD dwStopFlags) { MediaSeekingImpl *This = (MediaSeekingImpl *)iface; BOOL bChangeCurrent = FALSE, bChangeStop = FALSE; LONGLONG llNewCurrent, llNewStop; + struct pos_args args; TRACE("(%p, %x, %p, %x)\n", pCurrent, dwCurrentFlags, pStop, dwStopFlags); + args.current = pCurrent; + args.stop = pStop; + args.curflags = dwCurrentFlags; + args.stopflags = dwStopFlags; + EnterCriticalSection(This->crst); llNewCurrent = Adjust(This->llCurrent, pCurrent, dwCurrentFlags); @@ -359,6 +384,8 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p if (llNewStop != This->llStop) bChangeStop = TRUE; + TRACE("Old: %u, New: %u\n", (DWORD)(This->llCurrent/10000000), (DWORD)(llNewCurrent/10000000)); + This->llCurrent = llNewCurrent; This->llStop = llNewStop; @@ -367,13 +394,14 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p if (dwStopFlags & AM_SEEKING_ReturnTime) *pStop = llNewStop; + ForwardCmdSeek(This->crst, This->pUserData, fwd_setposition, &args); + LeaveCriticalSection(This->crst); + if (bChangeCurrent) This->fnChangeCurrent(This->pUserData); if (bChangeStop) This->fnChangeStop(This->pUserData); - LeaveCriticalSection(This->crst); - return S_OK; } @@ -436,7 +464,7 @@ HRESULT WINAPI MediaSeekingImpl_SetRate(IMediaSeeking * iface, double dRate) This->dRate = dRate; if (bChangeRate) hr = This->fnChangeRate(This->pUserData); - ForwardCmdSeek(This->pUserData, fwd_setrate, &dRate); + ForwardCmdSeek(This->crst, This->pUserData, fwd_setrate, &dRate); LeaveCriticalSection(This->crst); return hr;

1 0

Maarten Lankhorst : quartz: Don' t hold lock when changing state in filtergraph.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 7cb1324ae3d5924d8191d86ac2ab6306b2de36ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb1324ae3d5924d8191d86ac… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 1 14:03:34 2008 -0700 quartz: Don't hold lock when changing state in filtergraph. --- dlls/quartz/filtergraph.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4f8eebb..5fd6a95 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1472,7 +1472,9 @@ static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundF CoTaskMemFree(ppPins); } TRACE("Doing stuff with filter %p\n", PinInfo.pFilter); + LeaveCriticalSection(&pGraph->cs); FoundFilter(PinInfo.pFilter); + EnterCriticalSection(&pGraph->cs); } if (PinInfo.pFilter) IBaseFilter_Release(PinInfo.pFilter); @@ -1499,11 +1501,11 @@ static HRESULT WINAPI SendRun(IBaseFilter *pFilter) { } static HRESULT WINAPI SendPause(IBaseFilter *pFilter) { - return IBaseFilter_Pause(pFilter); + return IBaseFilter_Pause(pFilter); } static HRESULT WINAPI SendStop(IBaseFilter *pFilter) { - return IBaseFilter_Stop(pFilter); + return IBaseFilter_Stop(pFilter); } static HRESULT SendFilterMessage(IMediaControl *iface, fnFoundFilter FoundFilter) { @@ -1776,7 +1778,9 @@ static HRESULT all_renderers_seek(IFilterGraphImpl *This, fnFoundSeek FoundSeek, IBaseFilter_QueryInterface(pfilter, &IID_IMediaSeeking, (void**)&seek); if (!seek) continue; + LeaveCriticalSection(&This->cs); hr = FoundSeek(This, seek, arg); + EnterCriticalSection(&This->cs); IMediaSeeking_Release(seek); if (hr_return != E_NOTIMPL) allnotimpl = FALSE; @@ -1980,6 +1984,7 @@ static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, if (!pCurrent) return E_POINTER; + EnterCriticalSection(&This->cs); if (This->state == State_Running && This->refClock) { IReferenceClock_GetTime(This->refClock, &time); @@ -1991,6 +1996,7 @@ static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, } else *pCurrent = This->position; + LeaveCriticalSection(&This->cs); TRACE("Time: %lld.%03lld\n", *pCurrent / 10000000, (*pCurrent / 10000)%1000); return S_OK;

1 0

Vitaliy Margolen : winex11drv: Distinguish left and right keys for shift, ctrl and alt.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 9faf7e358630cb8e8d63e4a534a9b5b9a56b7e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9faf7e358630cb8e8d63e4a53… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Apr 1 23:13:45 2008 -0600 winex11drv: Distinguish left and right keys for shift, ctrl and alt. --- dlls/user32/tests/input.c | 438 +++++++++++++++++++++++++++++++++++++------ dlls/winex11.drv/keyboard.c | 76 +++++--- server/queue.c | 15 +- 3 files changed, 436 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9faf7e358630cb8e8d63e…

1 0

Maarten Lankhorst : quartz: Implement seeking stubs for transform filters.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: e18129068e3fcfdf98c8b8ee571d4ee015b13646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e18129068e3fcfdf98c8b8ee5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 1 13:41:25 2008 -0700 quartz: Implement seeking stubs for transform filters. --- dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- dlls/quartz/control_private.h | 5 ++ dlls/quartz/transform.c | 89 +++++++++++++++++++++++++++++++++++++++- dlls/quartz/transform.h | 5 ++- 5 files changed, 97 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index d34fcc6..ffe14c9 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -261,7 +261,7 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) This->reinit_codec = TRUE; - hr = TransformFilter_Create(&(This->tf), &CLSID_ACMWrapper, &ACMWrapper_FuncsTable); + hr = TransformFilter_Create(&(This->tf), &CLSID_ACMWrapper, &ACMWrapper_FuncsTable, NULL, NULL, NULL); if (FAILED(hr)) return hr; diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 16dfe69..b8a1b19 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -291,7 +291,7 @@ HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) This->pBihIn = NULL; This->pBihOut = NULL; - hr = TransformFilter_Create(&(This->tf), &CLSID_AVIDec, &AVIDec_FuncsTable); + hr = TransformFilter_Create(&(This->tf), &CLSID_AVIDec, &AVIDec_FuncsTable, NULL, NULL, NULL); if (FAILED(hr)) return hr; diff --git a/dlls/quartz/control_private.h b/dlls/quartz/control_private.h index 15855d6..b5e3997 100644 --- a/dlls/quartz/control_private.h +++ b/dlls/quartz/control_private.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef QUARTZ_CONTROL_H +#define QUARTZ_CONTROL_H + typedef HRESULT (* CHANGEPROC)(IBaseFilter *pUserData); typedef struct MediaSeekingImpl @@ -55,3 +58,5 @@ HRESULT WINAPI MediaSeekingImpl_GetAvailable(IMediaSeeking * iface, LONGLONG * p HRESULT WINAPI MediaSeekingImpl_SetRate(IMediaSeeking * iface, double dRate); HRESULT WINAPI MediaSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate); HRESULT WINAPI MediaSeekingImpl_GetPreroll(IMediaSeeking * iface, LONGLONG * pPreroll); + +#endif /*QUARTZ_CONTROL_H*/ diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index ccbca58..acf9352 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -143,7 +143,76 @@ static HRESULT TransformFilter_OutputPin_Construct(const PIN_INFO * pPinInfo, co return E_FAIL; } -HRESULT TransformFilter_Create(TransformFilterImpl* pTransformFilter, const CLSID* pClsid, const TransformFuncsTable* pFuncsTable) + +static inline TransformFilterImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) +{ + return (TransformFilterImpl *)((char*)iface - FIELD_OFFSET(TransformFilterImpl, mediaSeeking.lpVtbl)); +} + +static HRESULT WINAPI TransformFilter_Seeking_QueryInterface(IMediaSeeking * iface, REFIID riid, LPVOID * ppv) +{ + TransformFilterImpl *This = impl_from_IMediaSeeking(iface); + + return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); +} + +static ULONG WINAPI TransformFilter_Seeking_AddRef(IMediaSeeking * iface) +{ + TransformFilterImpl *This = impl_from_IMediaSeeking(iface); + + return IUnknown_AddRef((IUnknown *)This); +} + +static ULONG WINAPI TransformFilter_Seeking_Release(IMediaSeeking * iface) +{ + TransformFilterImpl *This = impl_from_IMediaSeeking(iface); + + return IUnknown_Release((IUnknown *)This); +} + +static const IMediaSeekingVtbl TransformFilter_Seeking_Vtbl = +{ + TransformFilter_Seeking_QueryInterface, + TransformFilter_Seeking_AddRef, + TransformFilter_Seeking_Release, + MediaSeekingImpl_GetCapabilities, + MediaSeekingImpl_CheckCapabilities, + MediaSeekingImpl_IsFormatSupported, + MediaSeekingImpl_QueryPreferredFormat, + MediaSeekingImpl_GetTimeFormat, + MediaSeekingImpl_IsUsingTimeFormat, + MediaSeekingImpl_SetTimeFormat, + MediaSeekingImpl_GetDuration, + MediaSeekingImpl_GetStopPosition, + MediaSeekingImpl_GetCurrentPosition, + MediaSeekingImpl_ConvertTimeFormat, + MediaSeekingImpl_SetPositions, + MediaSeekingImpl_GetPositions, + MediaSeekingImpl_GetAvailable, + MediaSeekingImpl_SetRate, + MediaSeekingImpl_GetRate, + MediaSeekingImpl_GetPreroll +}; + +static HRESULT TransformFilter_ChangeCurrent(IBaseFilter *iface) +{ + FIXME("(%p) filter hasn't implemented current position change!\n", iface); + return S_OK; +} + +static HRESULT TransformFilter_ChangeStop(IBaseFilter *iface) +{ + FIXME("(%p) filter hasn't implemented stop position change!\n", iface); + return S_OK; +} + +static HRESULT TransformFilter_ChangeRate(IBaseFilter *iface) +{ + FIXME("(%p) filter hasn't implemented rate change!\n", iface); + return S_OK; +} + +HRESULT TransformFilter_Create(TransformFilterImpl* pTransformFilter, const CLSID* pClsid, const TransformFuncsTable* pFuncsTable, CHANGEPROC stop, CHANGEPROC current, CHANGEPROC rate) { HRESULT hr; PIN_INFO piInput; @@ -184,8 +253,20 @@ HRESULT TransformFilter_Create(TransformFilterImpl* pTransformFilter, const CLSI hr = TransformFilter_OutputPin_Construct(&piOutput, &props, pTransformFilter, TransformFilter_Output_QueryAccept, &pTransformFilter->csFilter, &pTransformFilter->ppPins[1]); - if (FAILED(hr)) - ERR("Cannot create output pin (%x)\n", hr); + if (FAILED(hr)) + ERR("Cannot create output pin (%x)\n", hr); + else + { + if (!stop) + stop = TransformFilter_ChangeStop; + if (!current) + current = TransformFilter_ChangeCurrent; + if (!rate) + rate = TransformFilter_ChangeRate; + + MediaSeekingImpl_Init((IBaseFilter*)pTransformFilter, stop, current, rate, &pTransformFilter->mediaSeeking, &pTransformFilter->csFilter); + pTransformFilter->mediaSeeking.lpVtbl = &TransformFilter_Seeking_Vtbl; + } } else { @@ -213,6 +294,8 @@ static HRESULT WINAPI TransformFilter_QueryInterface(IBaseFilter * iface, REFIID *ppv = (LPVOID)This; else if (IsEqualIID(riid, &IID_IBaseFilter)) *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IMediaSeeking)) + *ppv = &This->mediaSeeking; if (*ppv) { diff --git a/dlls/quartz/transform.h b/dlls/quartz/transform.h index 209225e..89d7dfb 100644 --- a/dlls/quartz/transform.h +++ b/dlls/quartz/transform.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "control_private.h" + typedef struct TransformFilterImpl TransformFilterImpl; typedef struct TransformFuncsTable { @@ -40,10 +42,11 @@ struct TransformFilterImpl IReferenceClock * pClock; FILTER_INFO filterInfo; CLSID clsid; + struct MediaSeekingImpl mediaSeeking; IPin ** ppPins; const TransformFuncsTable * pFuncsTable; }; -HRESULT TransformFilter_Create(TransformFilterImpl*, const CLSID*, const TransformFuncsTable* pFuncsTable); +HRESULT TransformFilter_Create(TransformFilterImpl*, const CLSID*, const TransformFuncsTable* pFuncsTable, CHANGEPROC stop, CHANGEPROC current, CHANGEPROC rate);

1 0

Michael Stefaniuc : progman: Delete bitrotted translations.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: ca9f91b42c9e6d37d8f2e385d6818fb90e2ae2f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca9f91b42c9e6d37d8f2e385d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 2 01:11:05 2008 +0200 progman: Delete bitrotted translations. --- programs/progman/Da.rc | 142 ---------------------------------------------- programs/progman/Fi.rc | 134 ------------------------------------------- programs/progman/Sk.rc | 133 ------------------------------------------- programs/progman/Sw.rc | 133 ------------------------------------------- programs/progman/Va.rc | 137 -------------------------------------------- programs/progman/Wa.rc | 136 -------------------------------------------- programs/progman/rsrc.rc | 8 +-- 7 files changed, 1 insertions(+), 822 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca9f91b42c9e6d37d8f2e…

1 0

Vitaliy Margolen : winecfg: Update Russian translation.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 20a27fe1f71215f965b4257ca6953a5f5a3c840a URL: http://source.winehq.org/git/wine.git/?a=commit;h=20a27fe1f71215f965b4257ca… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Apr 1 23:12:51 2008 -0600 winecfg: Update Russian translation. --- programs/winecfg/Ru.rc | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index d358588..25c41bd 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -307,4 +307,19 @@ BEGIN IDC_SYSPARAMS_INACTIVE_TITLE "�� " IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "�� - ��" IDC_SYSPARAMS_MSGBOX_TEXT "�� - ��" + IDC_SYSPARAMS_APPWORKSPACE "�� MDI - ��" + IDC_SYSPARAMS_WINDOW_FRAME "�� - ��" + IDC_SYSPARAMS_ACTIVE_BORDER "�� - ��" + IDC_SYSPARAMS_INACTIVE_BORDER "�� - ��" + IDC_SYSPARAMS_BUTTON_SHADOW "�� - ��" + IDC_SYSPARAMS_GRAY_TEXT "�� " + IDC_SYSPARAMS_BUTTON_HILIGHT "�� - �� " + IDC_SYSPARAMS_BUTTON_DARK_SHADOW "�� - �� " + IDC_SYSPARAMS_BUTTON_LIGHT "�� - ��" + IDC_SYSPARAMS_BUTTON_ALTERNATE "�� - �� 2" + IDC_SYSPARAMS_HOT_TRACKING "��, ��" + IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "�� " + IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "�� " + IDC_SYSPARAMS_MENU_HILIGHT "�� - ��" + IDC_SYSPARAMS_MENUBAR "�� - ��" END

1 0