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

Maarten Lankhorst : quartz: Change longlong printfs.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 810a933f68fe458b19f7734794206151e4c3b38e URL: http://source.winehq.org/git/wine.git/?a=commit;h=810a933f68fe458b19f773479… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 18 22:23:19 2008 -0700 quartz: Change longlong printfs. --- dlls/quartz/dsoundrender.c | 4 +++- dlls/quartz/filtergraph.c | 3 ++- dlls/quartz/waveparser.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 9bcb417..4a90bb3 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -263,7 +263,9 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) ERR("Cannot get sample time (%x)\n", hr); if (This->rtLastStop != tStart && (IMediaSample_IsDiscontinuity(pSample) == S_FALSE)) - FIXME("Unexpected discontinuity: Last: %lld, tStart: %lld\n", This->rtLastStop, tStart); + FIXME("Unexpected discontinuity: Last: %u.%03u, tStart: %u.%03u\n", + (DWORD)(This->rtLastStop / 10000000), (DWORD)((This->rtLastStop / 10000)%1000), + (DWORD)(tStart / 10000000), (DWORD)((tStart / 10000)%1000)); This->rtLastStop = tStop; if (IMediaSample_IsPreroll(pSample) == S_OK) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index ee31068..c4b31f7 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2079,7 +2079,8 @@ static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, else *pCurrent = This->position; LeaveCriticalSection(&This->cs); - TRACE("Time: %lld.%03lld\n", *pCurrent / 10000000, (*pCurrent / 10000)%1000); + + TRACE("Time: %u.%03u\n", (DWORD)(*pCurrent / 10000000), (DWORD)((*pCurrent / 10000)%1000)); return S_OK; } diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 5aef9ef..8f51c8f 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -393,7 +393,7 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) pWAVEParser->Parser.mediaSeeking.llCurrent = 0; pWAVEParser->Parser.mediaSeeking.llStop = pWAVEParser->Parser.mediaSeeking.llDuration = bytepos_to_duration(pWAVEParser, pWAVEParser->EndOfFile); - TRACE("Duration: %lld seconds\n", pWAVEParser->Parser.mediaSeeking.llDuration / (LONGLONG)10000000); + TRACE("Duration: %u seconds\n", (DWORD)(pWAVEParser->Parser.mediaSeeking.llDuration / (LONGLONG)10000000)); This->rtStop = pWAVEParser->EndOfFile; This->rtStart = pWAVEParser->StartOfFile;

1 0

Stefan Leichter : shell32: Implement SHGetFolderPathAndSubDirA/W.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: a629a4199e388dbab941a38914ff6106b02e420a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a629a4199e388dbab941a3891… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Apr 17 23:31:05 2008 +0200 shell32: Implement SHGetFolderPathAndSubDirA/W. --- dlls/shell32/shell32.spec | 2 + dlls/shell32/shellpath.c | 86 ++++++++++++++++++++++++++++++++++++++++++-- include/shlobj.h | 3 ++ 3 files changed, 87 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 6c0d7d8..e054db3 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -344,6 +344,8 @@ @ stdcall SHGetFileInfoW(ptr long ptr long long) @ stdcall SHGetFolderLocation(long long long long ptr) @ stdcall SHGetFolderPathA(long long long long ptr) +@ stdcall SHGetFolderPathAndSubDirA(long long long long str ptr) +@ stdcall SHGetFolderPathAndSubDirW(long long long long wstr ptr) @ stdcall SHGetFolderPathW(long long long long ptr) @ stub SHGetFreeDiskSpace @ stub SHGetIconOverlayIndexA diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index c4ae688..abbaf19 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1675,21 +1675,88 @@ HRESULT WINAPI SHGetFolderPathW( DWORD dwFlags, /* [I] which path to return */ LPWSTR pszPath) /* [O] converted path */ { + HRESULT hr = SHGetFolderPathAndSubDirW(hwndOwner, nFolder, hToken, dwFlags, NULL, pszPath); + if(HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) == hr) + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + return hr; +} + +HRESULT WINAPI SHGetFolderPathAndSubDirA( + HWND hwndOwner, /* [I] owner window */ + int nFolder, /* [I] CSIDL identifying the folder */ + HANDLE hToken, /* [I] access token */ + DWORD dwFlags, /* [I] which path to return */ + LPCSTR pszSubPath, /* [I] sub directory of the specified folder */ + LPSTR pszPath) /* [O] converted path */ +{ + int length; + HRESULT hr = S_OK; + LPWSTR pszSubPathW = NULL; + LPWSTR pszPathW = NULL; + TRACE("%08x,%08x,%s\n",nFolder, dwFlags, debugstr_w(pszSubPathW)); + + if(pszPath) { + pszPathW = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + if(!pszPathW) { + hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); + WARN("Failed to allocate %u bytes of memory\n", MAX_PATH * sizeof(WCHAR)); + goto cleanup; + } + } + TRACE("%08x,%08x,%s\n",nFolder, dwFlags, debugstr_w(pszSubPathW)); + + /* SHGetFolderPathAndSubDirW does not distinguish if pszSubPath isn't + * set (null), or an empty string.therefore call it without the parameter set + * if pszSubPath is an empty string + */ + if (pszSubPath && pszSubPath[0]) { + length = MultiByteToWideChar(CP_ACP, 0, pszSubPath, -1, NULL, 0); + pszSubPathW = HeapAlloc(GetProcessHeap(), 0, length * sizeof(WCHAR)); + if(!pszSubPathW) { + hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); + WARN("Failed to allocate %u bytes of memory\n", length * sizeof(WCHAR)); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, pszSubPath, -1, pszSubPathW, length); + } + + hr = SHGetFolderPathAndSubDirW(hwndOwner, nFolder, hToken, dwFlags, pszSubPathW, pszPathW); + + if (SUCCEEDED(hr) && pszPath) + WideCharToMultiByte(CP_ACP, 0, pszPathW, -1, pszPath, MAX_PATH, NULL, NULL); + +cleanup: + HeapFree(GetProcessHeap(), 0, pszPathW); + HeapFree(GetProcessHeap(), 0, pszSubPathW); + return hr; +} + +HRESULT WINAPI SHGetFolderPathAndSubDirW( + HWND hwndOwner, /* [I] owner window */ + int nFolder, /* [I] CSIDL identifying the folder */ + HANDLE hToken, /* [I] access token */ + DWORD dwFlags, /* [I] which path to return */ + LPCWSTR pszSubPath,/* [I] sub directory of the specified folder */ + LPWSTR pszPath) /* [O] converted path */ +{ HRESULT hr; WCHAR szBuildPath[MAX_PATH], szTemp[MAX_PATH]; DWORD folder = nFolder & CSIDL_FOLDER_MASK; CSIDL_Type type; int ret; - TRACE("%p,%p,nFolder=0x%04x\n", hwndOwner,pszPath,nFolder); + TRACE("%p,%p,nFolder=0x%04x,%s\n", hwndOwner,pszPath,nFolder,debugstr_w(pszSubPath)); /* Windows always NULL-terminates the resulting path regardless of success * or failure, so do so first */ if (pszPath) *pszPath = '\0'; + if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) return E_INVALIDARG; + if ((SHGFP_TYPE_CURRENT != dwFlags) && (SHGFP_TYPE_DEFAULT != dwFlags)) + return E_INVALIDARG; szTemp[0] = 0; type = CSIDL_Data[folder].type; switch (type) @@ -1742,12 +1809,23 @@ HRESULT WINAPI SHGetFolderPathW( hr = _SHExpandEnvironmentStrings(szTemp, szBuildPath); else strcpyW(szBuildPath, szTemp); + + if (FAILED(hr)) goto end; + + if(pszSubPath) { + /* make sure the new path does not exceed th bufferlength + * rememebr to backslash and the termination */ + if(MAX_PATH < (lstrlenW(szBuildPath) + lstrlenW(pszSubPath) + 2)) { + hr = HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE); + goto end; + } + PathAppendW(szBuildPath, pszSubPath); + PathRemoveBackslashW(szBuildPath); + } /* Copy the path if it's available before we might return */ if (SUCCEEDED(hr) && pszPath) strcpyW(pszPath, szBuildPath); - if (FAILED(hr)) goto end; - /* if we don't care about existing directories we are ready */ if(nFolder & CSIDL_FLAG_DONT_VERIFY) goto end; @@ -1758,7 +1836,7 @@ HRESULT WINAPI SHGetFolderPathW( */ if (!(nFolder & CSIDL_FLAG_CREATE)) { - hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + hr = HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); goto end; } diff --git a/include/shlobj.h b/include/shlobj.h index 8dbccb7..159e85a 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -54,6 +54,9 @@ DWORD WINAPI SHFormatDrive(HWND,UINT,UINT,UINT); void WINAPI SHFree(LPVOID); BOOL WINAPI GetFileNameFromBrowse(HWND,LPSTR,DWORD,LPCSTR,LPCSTR,LPCSTR,LPCSTR); HRESULT WINAPI SHGetInstanceExplorer(IUnknown**); +HRESULT WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR); +HRESULT WINAPI SHGetFolderPathAndSubDirW(HWND,int,HANDLE,DWORD,LPCWSTR,LPWSTR); +#define SHGetFolderPathAndSubDir WINELIB_NAME_AW(SHGetFolderPathAndSubDir); BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST,LPSTR); BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST,LPWSTR); #define SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList)

1 0

Nikolay Sivov : gdiplus: Implemented GdipVectorTransformMatrixPointsI.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: f649c9d2244c5dafc5f0512ebeed12a8d38955bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f649c9d2244c5dafc5f0512eb… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Apr 19 01:28:47 2008 +0400 gdiplus: Implemented GdipVectorTransformMatrixPointsI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/matrix.c | 27 +++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index f2426b1..d6971f9 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -620,7 +620,7 @@ @ stub GdipTranslateTextureTransform @ stdcall GdipTranslateWorldTransform(ptr long long long) @ stdcall GdipVectorTransformMatrixPoints(ptr ptr long) -@ stub GdipVectorTransformMatrixPointsI +@ stdcall GdipVectorTransformMatrixPointsI(ptr ptr long) @ stub GdipWarpPath @ stub GdipWidenPath @ stub GdipWindingModeOutline diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index a40f690..e80031f 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -301,3 +301,30 @@ GpStatus WINGDIPAPI GdipVectorTransformMatrixPoints(GpMatrix *matrix, GpPointF * return Ok; } + +GpStatus WINGDIPAPI GdipVectorTransformMatrixPointsI(GpMatrix *matrix, GpPoint *pts, INT count) +{ + GpPointF *ptsF; + GpStatus ret; + INT i; + + ptsF = GdipAlloc(sizeof(GpPointF) * count); + if(!ptsF) + return OutOfMemory; + + for(i = 0; i < count; i++){ + ptsF[i].X = (REAL)pts[i].X; + ptsF[i].Y = (REAL)pts[i].Y; + } + + ret = GdipVectorTransformMatrixPoints(matrix, ptsF, count); + /* store back */ + if(ret == Ok) + for(i = 0; i < count; i++){ + pts[i].X = roundr(ptsF[i].X); + pts[i].Y = roundr(ptsF[i].Y); + } + GdipFree(ptsF); + + return ret; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 215864a..a8f6568 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -230,6 +230,7 @@ GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSetMatrixElements(GpMatrix*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix*,GpPointF*,INT); GpStatus WINGDIPAPI GdipVectorTransformMatrixPoints(GpMatrix*,GpPointF*,INT); +GpStatus WINGDIPAPI GdipVectorTransformMatrixPointsI(GpMatrix*,GpPoint*,INT); GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator**,GpPath*);

1 0

Alexander Dorofeyev : wined3d: Prevent console spamming in drawPrimitive.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 35979b920a4ba395cea52fe4c4bac581b0b10f97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35979b920a4ba395cea52fe4c… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sat Apr 19 00:42:03 2008 +0300 wined3d: Prevent console spamming in drawPrimitive. --- dlls/wined3d/drawprim.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 77b396a..559159d 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1062,14 +1062,26 @@ void drawPrimitive(IWineD3DDevice *iface, if(!use_vs(This)) { if(!This->strided_streams.u.s.position_transformed && This->activeContext->num_untracked_materials && This->stateBlock->renderState[WINED3DRS_LIGHTING]) { - FIXME("Using software emulation because not all material properties could be tracked\n"); + static BOOL first = TRUE; + if(first) { + FIXME("Using software emulation because not all material properties could be tracked\n"); + first = FALSE; + } else { + TRACE("Using software emulation because not all material properties could be tracked\n"); + } emulation = TRUE; } else if(This->activeContext->fog_coord && This->stateBlock->renderState[WINED3DRS_FOGENABLE]) { /* Either write a pipeline replacement shader or convert the specular alpha from unsigned byte * to a float in the vertex buffer */ - FIXME("Using software emulation because manual fog coordinates are provided\n"); + static BOOL first = TRUE; + if(first) { + FIXME("Using software emulation because manual fog coordinates are provided\n"); + first = FALSE; + } else { + TRACE("Using software emulation because manual fog coordinates are provided\n"); + } emulation = TRUE; } @@ -1083,7 +1095,13 @@ void drawPrimitive(IWineD3DDevice *iface, if (This->useDrawStridedSlow || emulation) { /* Immediate mode drawing */ if(use_vs(This)) { - FIXME("Using immediate mode with vertex shaders for half float emulation\n"); + static BOOL first = TRUE; + if(first) { + FIXME("Using immediate mode with vertex shaders for half float emulation\n"); + first = FALSE; + } else { + TRACE("Using immediate mode with vertex shaders for half float emulation\n"); + } drawStridedSlowVs(iface, strided, calculatedNumberOfindices, glPrimType, idxData, idxSize, minIndex, StartIdx, StartVertexIndex); } else {

1 0

Maarten Lankhorst : quartz: Set media time in the file source.
by Alexandre Julliard 21 Apr '08

21 Apr '08

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: No longer drop packets on discontinuities.
by Alexandre Julliard 21 Apr '08

21 Apr '08

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: Drop preroll frames in directsound renderer too .
by Alexandre Julliard 21 Apr '08

21 Apr '08

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: Fix theoretical memory leak.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 119d7caf79674988df6b57f6e0ee766031270ab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=119d7caf79674988df6b57f6e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Apr 17 11:33:35 2008 -0700 quartz: Fix theoretical memory leak. --- dlls/quartz/avisplit.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 89c02d4..a619dcf 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -525,13 +525,14 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE stream->streamheader = *pStrHdr; fSamplesPerSec = (float)pStrHdr->dwRate / (float)pStrHdr->dwScale; + CoTaskMemFree(amt.pbFormat); + amt.pbFormat = NULL; + amt.cbFormat = 0; switch (pStrHdr->fccType) { case streamtypeVIDEO: amt.formattype = FORMAT_VideoInfo; - amt.pbFormat = NULL; - amt.cbFormat = 0; break; case streamtypeAUDIO: amt.formattype = FORMAT_WaveFormatEx;

1 0

Maarten Lankhorst : quartz: Fix sample leak in file source on failure path.
by Alexandre Julliard 21 Apr '08

21 Apr '08

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

Maarten Lankhorst : quartz: Flux AsyncReader in PullPin_BeginFlush.
by Alexandre Julliard 21 Apr '08

21 Apr '08

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