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

Kusanagi Kouichi : winex11.drv: Generate WM_IME_ENDCOMPOSITION when preedit ends.
by Alexandre Julliard April 21, 2008

April 21, 2008

Module: wine Branch: master Commit: 9462190b992cf7637749978892a8bca00973cd90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9462190b992cf763774997889… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Fri Apr 18 21:52:20 2008 +0900 winex11.drv: Generate WM_IME_ENDCOMPOSITION when preedit ends. --- dlls/winex11.drv/ime.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index e4a2dd7..c3e5ccf 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -687,16 +687,22 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) TRACE("IMC_SETOPENSTATUS\n"); myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); - if (lpIMC->fOpen != myPrivate->bInternalState) + if (lpIMC->fOpen != myPrivate->bInternalState && + myPrivate->bInComposition) { if(lpIMC->fOpen == FALSE) { X11DRV_ForceXIMReset(lpIMC->hWnd); GenerateIMEMessage(hIMC,WM_IME_ENDCOMPOSITION,0,0); + myPrivate->bInComposition = FALSE; } else + { GenerateIMEMessage(hIMC,WM_IME_STARTCOMPOSITION,0,0); + GenerateIMEMessage(hIMC, WM_IME_COMPOSITION, 0, 0); + } } + myPrivate->bInternalState = lpIMC->fOpen; bRet = TRUE; } break; @@ -963,12 +969,18 @@ void IME_SetOpenStatus(BOOL fOpen) ImmDestroyIMCC(lpIMC->hCompStr); lpIMC->hCompStr = ImeCreateBlankCompStr(); } - myPrivate->bInternalState = fOpen; ImmUnlockIMCC(lpIMC->hPrivate); UnlockRealIMC(FROM_X11); - ImmSetOpenStatus(RealIMC(FROM_X11), fOpen); + if (myPrivate->bInComposition && fOpen == FALSE) + { + GenerateIMEMessage(FROM_X11, WM_IME_ENDCOMPOSITION, 0, 0); + myPrivate->bInComposition = FALSE; + } + + if (!myPrivate->bInternalState && fOpen == TRUE) + ImmSetOpenStatus(RealIMC(FROM_X11), fOpen); } void IME_XIMPresent(BOOL present)

1 0

Maarten Lankhorst : quartz: Add some more tests and fix wine to pass them.
by Alexandre Julliard April 21, 2008

April 21, 2008

Module: wine Branch: master Commit: f9c2d8e2f418fe901de82e3181491e4dd52af7ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c2d8e2f418fe901de82e318… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Apr 19 15:19:32 2008 -0700 quartz: Add some more tests and fix wine to pass them. --- dlls/quartz/dsoundrender.c | 3 +- dlls/quartz/enumpins.c | 13 +++++++- dlls/quartz/nullrenderer.c | 3 +- dlls/quartz/tests/filtergraph.c | 15 +++++++- dlls/quartz/tests/videorenderer.c | 64 +++++++++++++++++++++++++++++++++++++ dlls/quartz/transform.c | 3 +- dlls/quartz/videorenderer.c | 3 +- 7 files changed, 97 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 4a90bb3..c20c5e8 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -599,7 +599,8 @@ static HRESULT WINAPI DSoundRender_GetSyncSource(IBaseFilter * iface, IReference EnterCriticalSection(&This->csFilter); { *ppClock = This->pClock; - IReferenceClock_AddRef(This->pClock); + if (This->pClock) + IReferenceClock_AddRef(This->pClock); } LeaveCriticalSection(&This->csFilter); diff --git a/dlls/quartz/enumpins.c b/dlls/quartz/enumpins.c index 61e42b0..675ef5c 100644 --- a/dlls/quartz/enumpins.c +++ b/dlls/quartz/enumpins.c @@ -36,7 +36,12 @@ static const struct IEnumPinsVtbl IEnumPinsImpl_Vtbl; HRESULT IEnumPinsImpl_Construct(const ENUMPINDETAILS * pDetails, IEnumPins ** ppEnum) { - IEnumPinsImpl * pEnumPins = CoTaskMemAlloc(sizeof(IEnumPinsImpl)); + IEnumPinsImpl * pEnumPins; + + if (!ppEnum) + return E_POINTER; + + pEnumPins = CoTaskMemAlloc(sizeof(IEnumPinsImpl)); if (!pEnumPins) { *ppEnum = NULL; @@ -109,6 +114,12 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** TRACE("(%u, %p, %p)\n", cPins, ppPins, pcFetched); + if (!ppPins) + return E_POINTER; + + if (cPins > 1 && !pcFetched) + return E_INVALIDARG; + if (cFetched > 0) { ULONG i; diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index d871e67..f511a7b 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -463,7 +463,8 @@ static HRESULT WINAPI NullRenderer_GetSyncSource(IBaseFilter * iface, IReference EnterCriticalSection(&This->csFilter); { *ppClock = This->pClock; - IReferenceClock_AddRef(This->pClock); + if (This->pClock) + IReferenceClock_AddRef(This->pClock); } LeaveCriticalSection(&This->csFilter); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index d72b7b3..98be4b5 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -50,11 +50,21 @@ static void rungraph(void) HRESULT hr; IMediaControl* pmc; IMediaEvent* pme; + IMediaFilter* pmf; HANDLE hEvent; hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaControl, (LPVOID*)&pmc); ok(hr==S_OK, "Cannot get IMediaControl interface returned: %x\n", hr); + hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaFilter, (LPVOID*)&pmf); + ok(hr==S_OK, "Cannot get IMediaFilter interface returned: %x\n", hr); + + IMediaControl_Stop(pmc); + + IMediaFilter_SetSyncSource(pmf, NULL); + + IMediaFilter_Release(pmf); + hr = IMediaControl_Run(pmc); ok(hr==S_FALSE, "Cannot run the graph returned: %x\n", hr); @@ -64,6 +74,8 @@ static void rungraph(void) hr = IMediaControl_Stop(pmc); ok(hr==S_OK || hr == S_FALSE, "Cannot stop the graph returned: %x\n", hr); + IGraphBuilder_SetDefaultSyncSource(pgraph); + Sleep(10); trace("stop -> pause\n"); hr = IMediaControl_Pause(pmc); @@ -97,7 +109,6 @@ static void rungraph(void) hr = IMediaControl_Run(pmc); ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); - hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaEvent, (LPVOID*)&pme); ok(hr==S_OK, "Cannot get IMediaEvent interface returned: %x\n", hr); @@ -107,7 +118,7 @@ static void rungraph(void) /* WaitForSingleObject(hEvent, INFINITE); */ Sleep(20000); - hr = IMediaControl_Release(pme); + hr = IMediaEvent_Release(pme); ok(hr==2, "Releasing mediaevent returned: %x\n", hr); hr = IMediaControl_Stop(pmc); diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index ca119e7..378e019 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -86,6 +86,69 @@ static void test_query_interface(void) RELEASE_EXPECT(pVideoWindow, 1); } +static void test_pin(IPin *pin) +{ + IMemInputPin *mpin = NULL; + + IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&mpin); + + ok(mpin != NULL, "No IMemInputPin found!\n"); + if (mpin) + { + ok(IMemInputPin_ReceiveCanBlock(mpin) == S_OK, "Receive can't block for pin!\n"); + IMemInputPin_Release(mpin); + } + /* TODO */ +} + +static void test_basefilter(void) +{ + IEnumPins *pin_enum = NULL; + IBaseFilter *base = NULL; + IPin *pins[2]; + ULONG ref; + HRESULT hr; + + IUnknown_QueryInterface(pVideoRenderer, &IID_IBaseFilter, (void *)&base); + if (base == NULL) + { + /* test_query_interface handles this case */ + skip("No IBaseFilter\n"); + return; + } + + hr = IBaseFilter_EnumPins(base, NULL); + ok(hr == E_POINTER, "hr = %08x and not E_POINTER\n", hr); + + hr= IBaseFilter_EnumPins(base, &pin_enum); + ok(hr == S_OK, "hr = %08x and not S_OK\n", hr); + + hr = IEnumPins_Next(pin_enum, 1, NULL, NULL); + ok(hr == E_POINTER, "hr = %08x and not E_POINTER\n", hr); + + hr = IEnumPins_Next(pin_enum, 2, pins, NULL); + ok(hr == E_INVALIDARG, "hr = %08x and not E_INVALIDARG\n", hr); + + pins[0] = (void *)0xdead; + pins[1] = (void *)0xdeed; + + hr = IEnumPins_Next(pin_enum, 2, pins, &ref); + ok(hr == S_FALSE, "hr = %08x instead of S_FALSE\n", hr); + ok(pins[0] != (void *)0xdead && pins[0] != NULL, "pins[0] = %p\n", pins[0]); + if (pins[0] != (void *)0xdead && pins[0] != NULL) + { + test_pin(pins[0]); + IPin_Release(pins[0]); + } + + ok(pins[1] == (void *)0xdeed, "pins[1] = %p\n", pins[1]); + + ref = IEnumPins_Release(pin_enum); + ok(ref == 0, "ref is %u and not 0!\n", ref); + + IBaseFilter_Release(base); +} + START_TEST(videorenderer) { CoInitialize(NULL); @@ -93,6 +156,7 @@ START_TEST(videorenderer) return; test_query_interface(); + test_basefilter(); release_video_renderer(); } diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index b090e5b..2596f63 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -424,7 +424,8 @@ static HRESULT WINAPI TransformFilter_GetSyncSource(IBaseFilter * iface, IRefere EnterCriticalSection(&This->csFilter); { *ppClock = This->pClock; - IReferenceClock_AddRef(This->pClock); + if (This->pClock) + IReferenceClock_AddRef(This->pClock); } LeaveCriticalSection(&This->csFilter); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 5179bd0..f49f8fb 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -754,7 +754,8 @@ static HRESULT WINAPI VideoRenderer_GetSyncSource(IBaseFilter * iface, IReferenc EnterCriticalSection(&This->csFilter); { *ppClock = This->pClock; - IReferenceClock_AddRef(This->pClock); + if (This->pClock) + IReferenceClock_AddRef(This->pClock); } LeaveCriticalSection(&This->csFilter);

1 0

Alexander Dorofeyev : wined3d: Add missing check for p8 primary in surface_download_data.
by Alexandre Julliard April 21, 2008

April 21, 2008

Module: wine Branch: master Commit: db36665be5adaf7cbf99819ccead13437fd520b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db36665be5adaf7cbf99819cc… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sat Apr 19 00:41:58 2008 +0300 wined3d: Add missing check for p8 primary in surface_download_data. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7da9d92..e024b8d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -117,7 +117,7 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { int dst_pitch = 0; /* In case of P8 the index is stored in the alpha component if the primary render target uses P8 */ - if(This->resource.format == WINED3DFMT_P8) { + if(This->resource.format == WINED3DFMT_P8 && primary_render_target_is_p8(This->resource.wineD3DDevice)) { format = GL_ALPHA; type = GL_UNSIGNED_BYTE; }

1 0

Austin English : Spelling fixes.
by Alexandre Julliard April 21, 2008

April 21, 2008

Module: wine Branch: master Commit: aab8fae59a208efb23db5affcae6778713dcc8be URL: http://source.winehq.org/git/wine.git/?a=commit;h=aab8fae59a208efb23db5affc… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 21 00:17:27 2008 -0500 Spelling fixes. --- dlls/mciwave/mciwave.c | 8 ++++---- dlls/msvcrt/dir.c | 2 +- dlls/ntdll/tests/rtl.c | 4 ++-- dlls/ntdll/tests/string.c | 2 +- dlls/odbccp32/tests/misc.c | 2 +- dlls/oleaut32/variant.c | 16 ++++++++-------- dlls/oleaut32/vartype.c | 2 +- dlls/quartz/avisplit.c | 4 ++-- dlls/quartz/dsoundrender.c | 2 +- dlls/riched20/style.c | 2 +- dlls/rpcrt4/ndr_marshall.c | 4 ++-- dlls/serialui/confdlg.c | 2 +- dlls/setupapi/devinst.c | 2 +- dlls/setupapi/tests/stringtable.c | 2 +- dlls/setupapi/virtcopy.c | 2 +- dlls/shell32/shell.c | 2 +- dlls/shell32/shlfileop.c | 10 +++++----- dlls/shell32/tests/shlfileop.c | 8 ++++---- dlls/shlwapi/ordinal.c | 10 +++++----- dlls/shlwapi/path.c | 8 ++++---- dlls/shlwapi/reg.c | 2 +- dlls/shlwapi/resource.h | 2 +- dlls/shlwapi/string.c | 4 ++-- dlls/shlwapi/url.c | 4 ++-- dlls/spoolss/tests/spoolss.c | 2 +- 25 files changed, 54 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aab8fae59a208efb23db5…

1 0

Maarten Lankhorst : quartz: Drop preroll frames in directsound renderer too .
by Alexandre Julliard April 21, 2008

April 21, 2008

Module: wine Branch: master Commit: d7fbc7ef8cb92c1c7811ea70dd4c68ff21002929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7fbc7ef8cb92c1c7811ea70d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 18 16:14:41 2008 -0700 quartz: Drop preroll frames in directsound renderer too. --- dlls/quartz/dsoundrender.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 50892c0..963ec16 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -242,8 +242,15 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) TRACE("%p %p\n", iface, pSample); /* Slightly incorrect, Pause completes when a frame is received so we should signal - * pause completion here, but for sound receiving a single frame doesn't make sense + * pause completion here, but for sound playing a single frame doesn't make sense */ + + if (IMediaSample_IsPreroll(pSample) == S_OK) + { + TRACE("Preroll!\n"); + return S_OK; + } + if (This->state == State_Paused) return S_FALSE;

1 0

Maarten Lankhorst : quartz: No longer drop packets on discontinuities.
by Alexandre Julliard April 21, 2008

April 21, 2008

Module: wine Branch: master Commit: fb2c975a8f5b54f9e7a667ee3638f340d80f2af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb2c975a8f5b54f9e7a667ee3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 18 16:13:25 2008 -0700 quartz: No longer drop packets on discontinuities. --- dlls/quartz/acmwrapper.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 4d42980..8df37ef 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -118,11 +118,14 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte unprepare_header = TRUE; if (IMediaSample_IsDiscontinuity(pSample) == S_OK) + { res = acmStreamConvert(This->has, &ash, ACM_STREAMCONVERTF_START); + /* One sample could be converted to multiple packets */ + IMediaSample_SetDiscontinuity(pSample, FALSE); + } else res = acmStreamConvert(This->has, &ash, 0); - if (res) { if(res != MMSYSERR_MOREDATA) @@ -162,10 +165,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte } TRACE("Sample stop time: %u.%03u\n", (DWORD)(tStart/10000000), (DWORD)((tStart/10000)%1000)); - if (IMediaSample_IsDiscontinuity(pSample) == S_FALSE) - hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pOutSample); - else - TRACE("Skipping first sample: Discontinuity\n"); + hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pOutSample); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) { if (FAILED(hr))

1 0

Maarten Lankhorst : quartz: Set media time in the file source.
by Alexandre Julliard April 21, 2008

April 21, 2008

Module: wine Branch: master Commit: 0458c08b95d368cba6daf1f216c0e930c6387dd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0458c08b95d368cba6daf1f21… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 18 16:07:40 2008 -0700 quartz: Set media time in the file source. --- dlls/quartz/filesource.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 8704b50..930ebfc 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1127,6 +1127,9 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw if (SUCCEEDED(hr)) { + REFERENCE_TIME rtStart, rtStop; + REFERENCE_TIME rtSampleStart, rtSampleStop; + /* get any errors */ if (!This->bFlushing && !GetOverlappedResult(This->hFile, &pDataRq->ovl, &dwBytes, FALSE)) hr = HRESULT_FROM_WIN32(GetLastError()); @@ -1141,7 +1144,18 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw dwBytes = 0; } + /* Set the time on the sample */ IMediaSample_SetActualDataLength(pDataRq->pSample, dwBytes); + + rtStart = (DWORD64)pDataRq->ovl.u.s.Offset + ((DWORD64)pDataRq->ovl.u.s.OffsetHigh << 32); + rtStart = MEDIATIME_FROM_BYTES(rtStart); + rtStop = rtStart + MEDIATIME_FROM_BYTES(dwBytes); + + IMediaSample_GetTime(pDataRq->pSample, &rtSampleStart, &rtSampleStop); + assert(rtStart == rtSampleStart); + assert(rtStop <= rtSampleStop); + + IMediaSample_SetTime(pDataRq->pSample, &rtStart, &rtStop); } /* no need to close event handle since we will close it when the pin is destroyed */

1 0

Maarten Lankhorst : quartz: Make acmwrapper respect preroll samples.
by Alexandre Julliard April 21, 2008

April 21, 2008

Module: wine Branch: master Commit: 172347341ae4b9e23704b7cb3f6888b9f84452cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=172347341ae4b9e23704b7cb3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 18 16:07:05 2008 -0700 quartz: Make acmwrapper respect preroll samples. --- dlls/quartz/acmwrapper.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 35e154c..4d42980 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -58,7 +58,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte LPBYTE pbDstStream; LPBYTE pbSrcStream = NULL; ACMSTREAMHEADER ash; - BOOL unprepare_header = FALSE; + BOOL unprepare_header = FALSE, preroll; MMRESULT res; HRESULT hr; LONGLONG tStart = -1, tStop = -1, tMed; @@ -70,6 +70,8 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte return hr; } + preroll = (IMediaSample_IsPreroll(pSample) == S_OK); + IMediaSample_GetTime(pSample, &tStart, &tStop); cbSrcStream = IMediaSample_GetActualDataLength(pSample); @@ -91,6 +93,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte ERR("Unable to get delivery buffer (%x)\n", hr); return hr; } + IMediaSample_SetPreroll(pOutSample, preroll); hr = IMediaSample_SetActualDataLength(pOutSample, 0); assert(hr == S_OK);

1 0

Maarten Lankhorst : quartz: Flux AsyncReader in PullPin_BeginFlush.
by Alexandre Julliard April 21, 2008

April 21, 2008

Module: wine Branch: master Commit: d16639d1fad14ff2b7afa43acc57d78122478432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d16639d1fad14ff2b7afa43ac… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Apr 17 13:24:51 2008 -0700 quartz: Flux AsyncReader in PullPin_BeginFlush. --- dlls/quartz/pin.c | 44 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 0c333f7..b641ff2 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1357,6 +1357,8 @@ ULONG WINAPI PullPin_Release(IPin * iface) static DWORD WINAPI PullPin_Thread_Main(LPVOID pv) { + CoInitializeEx(NULL, COINIT_MULTITHREADED); + for (;;) SleepEx(INFINITE, TRUE); } @@ -1368,7 +1370,6 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) ALLOCATOR_PROPERTIES allocProps; - CoInitializeEx(NULL, COINIT_MULTITHREADED); EnterCriticalSection(This->pin.pCritSec); SetEvent(This->hEventStateChanged); @@ -1433,13 +1434,37 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) IMediaSample_Release(pSample); } while (This->rtCurrent < This->rtStop && hr == S_OK && !This->stop_playback); - CoUninitialize(); EnterCriticalSection(This->pin.pCritSec); This->state = State_Paused; LeaveCriticalSection(This->pin.pCritSec); TRACE("End\n"); } +static void CALLBACK PullPin_Thread_Flush(ULONG_PTR iface) +{ + PullPin *This = (PullPin *)iface; + IMediaSample *pSample; + + EnterCriticalSection(This->pin.pCritSec); + if (This->pReader) + { + /* Flush outstanding samples */ + IAsyncReader_BeginFlush(This->pReader); + + for (;;) + { + IMemAllocator_GetBuffer(This->pAlloc, &pSample, NULL, NULL, 0); + + if (!pSample) + break; + IMediaSample_Release(pSample); + } + + IAsyncReader_EndFlush(This->pReader); + } + LeaveCriticalSection(This->pin.pCritSec); +} + static void CALLBACK PullPin_Thread_Pause(ULONG_PTR iface) { PullPin *This = (PullPin *)iface; @@ -1454,7 +1479,6 @@ static void CALLBACK PullPin_Thread_Pause(ULONG_PTR iface) LeaveCriticalSection(This->pin.pCritSec); } - static void CALLBACK PullPin_Thread_Stop(ULONG_PTR iface) { PullPin *This = (PullPin *)iface; @@ -1477,6 +1501,7 @@ static void CALLBACK PullPin_Thread_Stop(ULONG_PTR iface) IBaseFilter_Release(This->pin.pinInfo.pFilter); + CoUninitialize(); ExitThread(0); } @@ -1567,8 +1592,8 @@ HRESULT PullPin_StopProcessing(PullPin * This) { TRACE("(%p)->()\n", This); - /* if we are connected */ - if (This->pAlloc && This->hThread) + /* if we are alive */ + if (This->hThread) { PullPin_WaitForStateChange(This, INFINITE); @@ -1613,6 +1638,15 @@ HRESULT WINAPI PullPin_BeginFlush(IPin * iface) PullPin_PauseProcessing(This); PullPin_WaitForStateChange(This, INFINITE); + + /* Workaround: The file async reader only cancels io on current thread + * only vista and newer have CancelIoEx, so try the thread context if available + * Anyone has some documentation on NtCancelFileIoEx? + */ + if (This->hThread) + QueueUserAPC(PullPin_Thread_Flush, This->hThread, (ULONG_PTR)This); + else + PullPin_Thread_Flush((ULONG_PTR)This); } LeaveCriticalSection(&This->thread_lock);

1 0

Maarten Lankhorst : quartz: Fix sample leak in file source on failure path.
by Alexandre Julliard April 21, 2008

April 21, 2008

Module: wine Branch: master Commit: 33b2f69c9fef56107665bb4ae0e915b2dcd8df13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33b2f69c9fef56107665bb4ae… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Apr 17 13:11:05 2008 -0700 quartz: Fix sample leak in file source on failure path. --- dlls/quartz/filesource.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index d31e150..8704b50 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1125,30 +1125,28 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw LeaveCriticalSection(&This->csList); } - if (SUCCEEDED(hr) && !This->bFlushing) + if (SUCCEEDED(hr)) { /* get any errors */ - if (!GetOverlappedResult(This->hFile, &pDataRq->ovl, &dwBytes, FALSE)) + if (!This->bFlushing && !GetOverlappedResult(This->hFile, &pDataRq->ovl, &dwBytes, FALSE)) hr = HRESULT_FROM_WIN32(GetLastError()); - } - if (SUCCEEDED(hr)) - { - IMediaSample_SetActualDataLength(pDataRq->pSample, dwBytes); + /* Return the sample no matter what so it can be destroyed */ *ppSample = pDataRq->pSample; *pdwUser = pDataRq->dwUserData; + + if (This->bFlushing) + { + hr = VFW_E_WRONG_STATE; + dwBytes = 0; + } + + IMediaSample_SetActualDataLength(pDataRq->pSample, dwBytes); } /* no need to close event handle since we will close it when the pin is destroyed */ CoTaskMemFree(pDataRq); - /* Return the sample if flushing so it can be destroyed */ - if (This->bFlushing && SUCCEEDED(hr)) - { - hr = VFW_E_WRONG_STATE; - IMediaSample_SetActualDataLength(pDataRq->pSample, 0); - } - TRACE("-- %x\n", hr); return hr; }

1 0