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

James Hawkins : msi: win95 returns ERROR_BAD_PATHNAME.
by Alexandre Julliard 20 Mar '08

20 Mar '08

Module: wine Branch: master Commit: a9ebec9849438833f1e471373ceba23595a561fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9ebec9849438833f1e471373… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Mar 20 00:05:32 2008 -0700 msi: win95 returns ERROR_BAD_PATHNAME. --- dlls/msi/tests/msi.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 5da8673..62219fd 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -304,7 +304,8 @@ static void test_MsiGetFileHash(void) /* szFilePath is empty */ r = pMsiGetFileHashA("", 0, &hash); - ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %d\n", r); + ok(r == ERROR_PATH_NOT_FOUND || r == ERROR_BAD_PATHNAME, + "Expected ERROR_PATH_NOT_FOUND or ERROR_BAD_PATHNAME, got %d\n", r); /* szFilePath is nonexistent */ r = pMsiGetFileHashA(name, 0, &hash);

1 0

James Hawkins : msi: Clean up the db when skipping the tests.
by Alexandre Julliard 20 Mar '08

20 Mar '08

Module: wine Branch: master Commit: 0b98ce8ff5e5c12d66e65ac655ddd8a7d021ac39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b98ce8ff5e5c12d66e65ac65… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Mar 20 00:06:14 2008 -0700 msi: Clean up the db when skipping the tests. --- dlls/msi/tests/db.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 5bb049d..ac15d24 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1647,6 +1647,8 @@ static void test_msiimport(void) { /* win9x doesn't handle this case */ skip("endlines not handled correctly.\n"); + MsiCloseHandle(hdb); + DeleteFileA(msifile); return; }

1 0

James Hawkins : msi: Fix the type of the ID parameter of MsiSourceListEnumMediaDisks.
by Alexandre Julliard 20 Mar '08

20 Mar '08

Module: wine Branch: master Commit: e94b065df3ad4f0700b8c6a711369f22b9aea75d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e94b065df3ad4f0700b8c6a71… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Mar 20 00:04:49 2008 -0700 msi: Fix the type of the ID parameter of MsiSourceListEnumMediaDisks. --- dlls/msi/files.c | 3 +-- dlls/msi/source.c | 4 ++-- dlls/msi/tests/source.c | 4 ++-- include/msi.h | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index b43337a..e0f7889 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -599,8 +599,7 @@ static UINT find_published_source(MSIPACKAGE *package, struct media_info *mi) WCHAR volume[MAX_PATH]; WCHAR prompt[MAX_PATH]; DWORD volumesz, promptsz; - DWORD index, size; - WORD id; + DWORD index, size, id; UINT r; r = MsiSourceListGetInfoW(package->ProductCode, NULL, diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 1d90ad8..f50d545 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -145,7 +145,7 @@ static UINT OpenURLSubkey(HKEY rootkey, HKEY *key, BOOL create) */ UINT WINAPI MsiSourceListEnumMediaDisksA(LPCSTR szProductCodeOrPatchCode, LPCSTR szUserSid, MSIINSTALLCONTEXT dwContext, - DWORD dwOptions, DWORD dwIndex, LPWORD pdwDiskId, + DWORD dwOptions, DWORD dwIndex, LPDWORD pdwDiskId, LPSTR szVolumeLabel, LPDWORD pcchVolumeLabel, LPSTR szDiskPrompt, LPDWORD pcchDiskPrompt) { @@ -204,7 +204,7 @@ done: */ UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR szProductCodeOrPatchCode, LPCWSTR szUserSid, MSIINSTALLCONTEXT dwContext, - DWORD dwOptions, DWORD dwIndex, LPWORD pdwDiskId, + DWORD dwOptions, DWORD dwIndex, LPDWORD pdwDiskId, LPWSTR szVolumeLabel, LPDWORD pcchVolumeLabel, LPWSTR szDiskPrompt, LPDWORD pcchDiskPrompt) { diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 5f75159..b109315 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -36,7 +36,7 @@ static UINT (WINAPI *pMsiSourceListAddMediaDiskA) static UINT (WINAPI *pMsiSourceListAddSourceExA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, LPCSTR, DWORD); static UINT (WINAPI *pMsiSourceListEnumMediaDisksA) - (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPWORD, LPSTR, + (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPDWORD, LPSTR, LPDWORD, LPSTR, LPDWORD); static UINT (WINAPI *pMsiSourceListEnumSourcesA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPSTR, LPDWORD); @@ -2297,7 +2297,7 @@ static void test_MsiSourceListEnumMediaDisks(void) DWORD labelsz, promptsz; LPSTR usersid; DWORD val; - WORD id; + DWORD id; LONG res; UINT r; diff --git a/include/msi.h b/include/msi.h index 07ac32d..1ffce4e 100644 --- a/include/msi.h +++ b/include/msi.h @@ -545,9 +545,9 @@ UINT WINAPI MsiSourceListAddSourceA(LPCSTR, LPCSTR, DWORD, LPCSTR); UINT WINAPI MsiSourceListAddSourceW(LPCWSTR, LPCWSTR, DWORD, LPCWSTR); #define MsiSourceListAddSource WINELIB_NAME_AW(MsiSourceListAddSource) -UINT WINAPI MsiSourceListEnumMediaDisksA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPWORD, +UINT WINAPI MsiSourceListEnumMediaDisksA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPDWORD, LPSTR, LPDWORD, LPSTR, LPDWORD); -UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPWORD, +UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPDWORD, LPWSTR, LPDWORD, LPWSTR, LPDWORD); #define MsiSourceListEnumMediaDisks WINELIB_NAME_AW(MsiSourceListEnumMediaDisks)

1 0

Maarten Lankhorst : quartz: Add critical sections to IMediaSeeking.
by Alexandre Julliard 20 Mar '08

20 Mar '08

Module: wine Branch: master Commit: 734d6159d520e8440e72d7518f22d250e639ff51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=734d6159d520e8440e72d7518… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 19 18:27:07 2008 -0700 quartz: Add critical sections to IMediaSeeking. --- dlls/quartz/control.c | 50 ++++++++++++++++++++++++++++++---------- dlls/quartz/control_private.h | 4 ++- dlls/quartz/parser.c | 2 +- 3 files changed, 41 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index 5c7c547..2fd08a5 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -HRESULT MediaSeekingImpl_Init(IBaseFilter *pUserData, CHANGEPROC fnChangeStop, CHANGEPROC fnChangeStart, CHANGEPROC fnChangeRate, MediaSeekingImpl * pSeeking) +HRESULT MediaSeekingImpl_Init(IBaseFilter *pUserData, CHANGEPROC fnChangeStop, CHANGEPROC fnChangeStart, CHANGEPROC fnChangeRate, MediaSeekingImpl * pSeeking, PCRITICAL_SECTION crit_sect) { assert(fnChangeStop && fnChangeStart && fnChangeRate); @@ -47,6 +47,8 @@ HRESULT MediaSeekingImpl_Init(IBaseFilter *pUserData, CHANGEPROC fnChangeStop, C pSeeking->llStop = ((ULONGLONG)0x80000000) << 32; pSeeking->llDuration = pSeeking->llStop - pSeeking->llStart; pSeeking->dRate = 1.0; + pSeeking->timeformat = TIME_FORMAT_MEDIA_TIME; + pSeeking->crst = crit_sect; return S_OK; } @@ -99,24 +101,29 @@ HRESULT WINAPI MediaSeekingImpl_QueryPreferredFormat(IMediaSeeking * iface, GUID HRESULT WINAPI MediaSeekingImpl_GetTimeFormat(IMediaSeeking * iface, GUID * pFormat) { + MediaSeekingImpl *This = (MediaSeekingImpl *)iface; TRACE("(%s)\n", qzdebugstr_guid(pFormat)); - *pFormat = TIME_FORMAT_MEDIA_TIME; + EnterCriticalSection(This->crst); + *pFormat = This->timeformat; + LeaveCriticalSection(This->crst); + return S_OK; } HRESULT WINAPI MediaSeekingImpl_IsUsingTimeFormat(IMediaSeeking * iface, const GUID * pFormat) { - TRACE("(%s)\n", qzdebugstr_guid(pFormat)); - - return (IsEqualIID(pFormat, &TIME_FORMAT_MEDIA_TIME) ? S_OK : S_FALSE); -} + MediaSeekingImpl *This = (MediaSeekingImpl *)iface; + HRESULT hr = S_OK; -HRESULT WINAPI MediaSeekingImpl_SetTimeFormat(IMediaSeeking * iface, const GUID * pFormat) -{ TRACE("(%s)\n", qzdebugstr_guid(pFormat)); - return (IsEqualIID(pFormat, &TIME_FORMAT_MEDIA_TIME) ? S_OK : S_FALSE); + EnterCriticalSection(This->crst); + if (!IsEqualIID(pFormat, &This->timeformat)) + hr = S_FALSE; + LeaveCriticalSection(This->crst); + + return hr; } HRESULT WINAPI MediaSeekingImpl_GetDuration(IMediaSeeking * iface, LONGLONG * pDuration) @@ -125,7 +132,9 @@ HRESULT WINAPI MediaSeekingImpl_GetDuration(IMediaSeeking * iface, LONGLONG * pD TRACE("(%p)\n", pDuration); + EnterCriticalSection(This->crst); *pDuration = This->llDuration; + LeaveCriticalSection(This->crst); return S_OK; } @@ -136,7 +145,9 @@ HRESULT WINAPI MediaSeekingImpl_GetStopPosition(IMediaSeeking * iface, LONGLONG TRACE("(%p)\n", pStop); + EnterCriticalSection(This->crst); *pStop = This->llStop; + LeaveCriticalSection(This->crst); return S_OK; } @@ -147,7 +158,9 @@ HRESULT WINAPI MediaSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGLO TRACE("(%p)\n", pCurrent); + EnterCriticalSection(This->crst); *pCurrent = This->llStart; + LeaveCriticalSection(This->crst); return S_OK; } @@ -188,6 +201,7 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p TRACE("(%p, %x, %p, %x)\n", pCurrent, dwCurrentFlags, pStop, dwStopFlags); + EnterCriticalSection(This->crst); llNewStart = Adjust(This->llStart, pCurrent, dwCurrentFlags); llNewStop = Adjust(This->llStop, pStop, dwStopFlags); @@ -208,6 +222,7 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p This->fnChangeStart(This->pUserData); if (bChangeStop) This->fnChangeStop(This->pUserData); + LeaveCriticalSection(This->crst); return S_OK; } @@ -218,9 +233,11 @@ HRESULT WINAPI MediaSeekingImpl_GetPositions(IMediaSeeking * iface, LONGLONG * p TRACE("(%p, %p)\n", pCurrent, pStop); + EnterCriticalSection(This->crst); *pCurrent = This->llStart; *pStop = This->llStop; - + LeaveCriticalSection(This->crst); + return S_OK; } @@ -230,8 +247,10 @@ HRESULT WINAPI MediaSeekingImpl_GetAvailable(IMediaSeeking * iface, LONGLONG * p TRACE("(%p, %p)\n", pEarliest, pLatest); + EnterCriticalSection(This->crst); *pEarliest = 0; *pLatest = This->llDuration; + LeaveCriticalSection(This->crst); return S_OK; } @@ -240,14 +259,17 @@ HRESULT WINAPI MediaSeekingImpl_SetRate(IMediaSeeking * iface, double dRate) { MediaSeekingImpl *This = (MediaSeekingImpl *)iface; BOOL bChangeRate = (dRate != This->dRate); + HRESULT hr = S_OK; TRACE("(%e)\n", dRate); + EnterCriticalSection(This->crst); This->dRate = dRate; if (bChangeRate) - return This->fnChangeRate(This->pUserData); - else - return S_OK; + hr = This->fnChangeRate(This->pUserData); + LeaveCriticalSection(This->crst); + + return hr; } HRESULT WINAPI MediaSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate) @@ -256,7 +278,9 @@ HRESULT WINAPI MediaSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate) TRACE("(%p)\n", dRate); + EnterCriticalSection(This->crst); *dRate = This->dRate; + LeaveCriticalSection(This->crst); return S_OK; } diff --git a/dlls/quartz/control_private.h b/dlls/quartz/control_private.h index c594f60..80e550d 100644 --- a/dlls/quartz/control_private.h +++ b/dlls/quartz/control_private.h @@ -34,9 +34,11 @@ typedef struct MediaSeekingImpl LONGLONG llStart; LONGLONG llStop; LONGLONG llDuration; /* FIXME: needed? */ + GUID timeformat; + PCRITICAL_SECTION crst; } MediaSeekingImpl; -HRESULT MediaSeekingImpl_Init(IBaseFilter *pUserData, CHANGEPROC fnChangeStop, CHANGEPROC fnChangeStart, CHANGEPROC fnChangeRate, MediaSeekingImpl * pSeeking); +HRESULT MediaSeekingImpl_Init(IBaseFilter *pUserData, CHANGEPROC fnChangeStop, CHANGEPROC fnChangeStart, CHANGEPROC fnChangeRate, MediaSeekingImpl * pSeeking, PCRITICAL_SECTION crit_sect); HRESULT WINAPI MediaSeekingImpl_GetCapabilities(IMediaSeeking * iface, DWORD * pCapabilities); HRESULT WINAPI MediaSeekingImpl_CheckCapabilities(IMediaSeeking * iface, DWORD * pCapabilities); diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 1531431..868c625 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -80,7 +80,7 @@ HRESULT Parser_Create(ParserImpl* pParser, const CLSID* pClsid, PFN_PROCESS_SAMP piInput.pFilter = (IBaseFilter *)pParser; lstrcpynW(piInput.achName, wcsInputPinName, sizeof(piInput.achName) / sizeof(piInput.achName[0])); - MediaSeekingImpl_Init((IBaseFilter*)pParser, Parser_ChangeStop, Parser_ChangeStart, Parser_ChangeRate, &pParser->mediaSeeking); + MediaSeekingImpl_Init((IBaseFilter*)pParser, Parser_ChangeStop, Parser_ChangeStart, Parser_ChangeRate, &pParser->mediaSeeking, &pParser->csFilter); pParser->mediaSeeking.lpVtbl = &Parser_Seeking_Vtbl; hr = Parser_InputPin_Construct(&piInput, fnProcessSample, (LPVOID)pParser, fnQueryAccept, &pParser->csFilter, (IPin **)&pParser->pInputPin);

1 0

Maarten Lankhorst : quartz: Implement forwarding mediaseeking messages.
by Alexandre Julliard 20 Mar '08

20 Mar '08

Module: wine Branch: master Commit: e02322aef89dd3b452ff2e566692ad4d3bab5776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02322aef89dd3b452ff2e566… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 19 18:31:45 2008 -0700 quartz: Implement forwarding mediaseeking messages. --- dlls/quartz/control.c | 167 +++++++++++++++++++++++++++++++++++++++++- dlls/quartz/pin.c | 2 +- dlls/quartz/quartz_private.h | 1 + 3 files changed, 168 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index 2fd08a5..5cfa313 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -29,6 +29,72 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); + +typedef HRESULT (*SeekFunc)( IMediaSeeking *to, LPVOID arg ); + +static HRESULT ForwardCmdSeek( IBaseFilter* from, SeekFunc fnSeek, LPVOID arg ) +{ + HRESULT hr = S_OK; + HRESULT hr_return = S_OK; + IEnumPins *enumpins = NULL; + BOOL foundend = FALSE, allnotimpl = TRUE; + + hr = IBaseFilter_EnumPins( from, &enumpins ); + if (FAILED(hr)) + goto out; + + hr = IEnumPins_Reset( enumpins ); + while (hr == S_OK) { + IPin *pin = NULL; + hr = IEnumPins_Next( enumpins, 1, &pin, NULL ); + if (hr == VFW_E_ENUM_OUT_OF_SYNC) + { + hr = IEnumPins_Reset( enumpins ); + continue; + } + if (pin) + { + PIN_DIRECTION dir; + + IPin_QueryDirection( pin, &dir ); + if (dir == PINDIR_INPUT) + { + IPin *connected = NULL; + + IPin_ConnectedTo( pin, &connected ); + if (connected) + { + HRESULT hr_local; + IMediaSeeking *seek = NULL; + + hr_local = IPin_QueryInterface( connected, &IID_IMediaSeeking, (void**)&seek ); + if (!hr_local) + { + foundend = TRUE; + hr_local = fnSeek( seek , arg ); + if (hr_local != E_NOTIMPL) + allnotimpl = FALSE; + + hr_return = updatehres( hr_return, hr_local ); + IMediaSeeking_Release( seek ); + } + IPin_Release(connected); + } + } + IPin_Release( pin ); + } + } while (hr == S_OK); + if (foundend && allnotimpl) + hr = E_NOTIMPL; + else + hr = hr_return; + +out: + FIXME("Returning: %08x\n", hr); + return hr; +} + + HRESULT MediaSeekingImpl_Init(IBaseFilter *pUserData, CHANGEPROC fnChangeStop, CHANGEPROC fnChangeStart, CHANGEPROC fnChangeRate, MediaSeekingImpl * pSeeking, PCRITICAL_SECTION crit_sect) { assert(fnChangeStop && fnChangeStart && fnChangeRate); @@ -65,6 +131,12 @@ HRESULT WINAPI MediaSeekingImpl_GetCapabilities(IMediaSeeking * iface, DWORD * p return S_OK; } +static HRESULT fwd_checkcaps(IMediaSeeking *iface, LPVOID pcaps) +{ + DWORD *caps = pcaps; + return IMediaSeeking_CheckCapabilities(iface, caps); +} + HRESULT WINAPI MediaSeekingImpl_CheckCapabilities(IMediaSeeking * iface, DWORD * pCapabilities) { MediaSeekingImpl *This = (MediaSeekingImpl *)iface; @@ -73,6 +145,13 @@ HRESULT WINAPI MediaSeekingImpl_CheckCapabilities(IMediaSeeking * iface, DWORD * TRACE("(%p)\n", pCapabilities); + if (!pCapabilities) + return E_POINTER; + + hr = ForwardCmdSeek(This->pUserData, fwd_checkcaps, pCapabilities); + if (FAILED(hr) && hr != E_NOTIMPL) + return hr; + dwCommonCaps = *pCapabilities & This->dwCapabilities; if (!dwCommonCaps) @@ -126,6 +205,39 @@ HRESULT WINAPI MediaSeekingImpl_IsUsingTimeFormat(IMediaSeeking * iface, const G return hr; } + +static HRESULT fwd_settimeformat(IMediaSeeking *iface, LPVOID pformat) +{ + const GUID *format = pformat; + return IMediaSeeking_SetTimeFormat(iface, format); +} + +HRESULT WINAPI MediaSeekingImpl_SetTimeFormat(IMediaSeeking * iface, const GUID * pFormat) +{ + MediaSeekingImpl *This = (MediaSeekingImpl *)iface; + TRACE("(%s)\n", qzdebugstr_guid(pFormat)); + + ForwardCmdSeek(This->pUserData, fwd_settimeformat, (LPVOID)pFormat); + + return (IsEqualIID(pFormat, &TIME_FORMAT_MEDIA_TIME) ? S_OK : S_FALSE); +} + + +static HRESULT fwd_getduration(IMediaSeeking *iface, LPVOID pdur) +{ + LONGLONG *duration = pdur; + LONGLONG mydur = *duration; + HRESULT hr; + + hr = IMediaSeeking_GetDuration(iface, &mydur); + if (FAILED(hr)) + return hr; + + if ((mydur < *duration) || (*duration < 0 && mydur > 0)) + *duration = mydur; + return hr; +} + HRESULT WINAPI MediaSeekingImpl_GetDuration(IMediaSeeking * iface, LONGLONG * pDuration) { MediaSeekingImpl *This = (MediaSeekingImpl *)iface; @@ -134,11 +246,28 @@ HRESULT WINAPI MediaSeekingImpl_GetDuration(IMediaSeeking * iface, LONGLONG * pD EnterCriticalSection(This->crst); *pDuration = This->llDuration; + ForwardCmdSeek(This->pUserData, fwd_getduration, pDuration); LeaveCriticalSection(This->crst); return S_OK; } + +static HRESULT fwd_getstopposition(IMediaSeeking *iface, LPVOID pdur) +{ + LONGLONG *duration = pdur; + LONGLONG mydur = *duration; + HRESULT hr; + + hr = IMediaSeeking_GetStopPosition(iface, &mydur); + if (FAILED(hr)) + return hr; + + if ((mydur < *duration) || (*duration < 0 && mydur > 0)) + *duration = mydur; + return hr; +} + HRESULT WINAPI MediaSeekingImpl_GetStopPosition(IMediaSeeking * iface, LONGLONG * pStop) { MediaSeekingImpl *This = (MediaSeekingImpl *)iface; @@ -147,11 +276,29 @@ HRESULT WINAPI MediaSeekingImpl_GetStopPosition(IMediaSeeking * iface, LONGLONG EnterCriticalSection(This->crst); *pStop = This->llStop; + ForwardCmdSeek(This->pUserData, fwd_getstopposition, pStop); LeaveCriticalSection(This->crst); return S_OK; } + +static HRESULT fwd_getcurposition(IMediaSeeking *iface, LPVOID pdur) +{ + LONGLONG *duration = pdur; + LONGLONG mydur = *duration; + HRESULT hr; + + hr = IMediaSeeking_GetCurrentPosition(iface, &mydur); + if (FAILED(hr)) + return hr; + + if ((mydur < *duration) || (*duration < 0 && mydur > 0)) + *duration = mydur; + return hr; +} + +/* FIXME: Make use of the info the filter should expose */ HRESULT WINAPI MediaSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGLONG * pCurrent) { MediaSeekingImpl *This = (MediaSeekingImpl *)iface; @@ -160,6 +307,7 @@ HRESULT WINAPI MediaSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGLO EnterCriticalSection(This->crst); *pCurrent = This->llStart; + ForwardCmdSeek(This->pUserData, fwd_getcurposition, pCurrent); LeaveCriticalSection(This->crst); return S_OK; @@ -202,6 +350,7 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p TRACE("(%p, %x, %p, %x)\n", pCurrent, dwCurrentFlags, pStop, dwStopFlags); EnterCriticalSection(This->crst); + llNewStart = Adjust(This->llStart, pCurrent, dwCurrentFlags); llNewStop = Adjust(This->llStop, pStop, dwStopFlags); @@ -222,6 +371,7 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p This->fnChangeStart(This->pUserData); if (bChangeStop) This->fnChangeStop(This->pUserData); + LeaveCriticalSection(This->crst); return S_OK; @@ -250,11 +400,24 @@ HRESULT WINAPI MediaSeekingImpl_GetAvailable(IMediaSeeking * iface, LONGLONG * p EnterCriticalSection(This->crst); *pEarliest = 0; *pLatest = This->llDuration; - LeaveCriticalSection(This->crst); + EnterCriticalSection(This->crst); return S_OK; } +static HRESULT fwd_setrate(IMediaSeeking *iface, LPVOID prate) +{ + double *rate = prate; + + HRESULT hr; + + hr = IMediaSeeking_SetRate(iface, *rate); + if (FAILED(hr)) + return hr; + + return hr; +} + HRESULT WINAPI MediaSeekingImpl_SetRate(IMediaSeeking * iface, double dRate) { MediaSeekingImpl *This = (MediaSeekingImpl *)iface; @@ -267,6 +430,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); LeaveCriticalSection(This->crst); return hr; @@ -279,6 +443,7 @@ HRESULT WINAPI MediaSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate) TRACE("(%p)\n", dRate); EnterCriticalSection(This->crst); + /* Forward? */ *dRate = This->dRate; LeaveCriticalSection(This->crst); diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 1ff3d8f..878f53a 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -45,7 +45,7 @@ typedef HRESULT (*SendPinFunc)( IPin *to, LPVOID arg ); * Return the first received error code (E_NOTIMPL is ignored) * If no errors occur: return the first received non-error-code that isn't S_OK */ -static HRESULT updatehres( HRESULT original, HRESULT new ) +HRESULT updatehres( HRESULT original, HRESULT new ) { if (FAILED( original ) || new == E_NOTIMPL) return original; diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index f730876..528b59b 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -85,5 +85,6 @@ void FreeMediaType(AM_MEDIA_TYPE * pmt); void DeleteMediaType(AM_MEDIA_TYPE * pmt); BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, BOOL bWildcards); void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt); +HRESULT updatehres( HRESULT original, HRESULT new ); #endif /* __QUARTZ_PRIVATE_INCLUDED__ */

1 0

Maarten Lankhorst : quartz: Add mediaseeking stub to audio renderer.
by Alexandre Julliard 20 Mar '08

20 Mar '08

Module: wine Branch: master Commit: 9ec4240065f1494fb90c2e1aa61be1330f9fe340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec4240065f1494fb90c2e1aa… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 19 18:29:09 2008 -0700 quartz: Add mediaseeking stub to audio renderer. --- dlls/quartz/dsoundrender.c | 76 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 6c5d3f1..ec1b9fe 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -45,6 +45,7 @@ static const IPinVtbl DSoundRender_InputPin_Vtbl; static const IMemInputPinVtbl MemInputPin_Vtbl; static const IBasicAudioVtbl IBasicAudio_Vtbl; static const IReferenceClockVtbl IReferenceClock_Vtbl; +static const IMediaSeekingVtbl IMediaSeeking_Vtbl; typedef struct DSoundRenderImpl { @@ -71,11 +72,31 @@ typedef struct DSoundRenderImpl DWORD last_play_pos; DWORD play_loops; REFERENCE_TIME play_time; + MediaSeekingImpl mediaSeeking; long volume; long pan; } DSoundRenderImpl; +static HRESULT sound_mod_stop(IBaseFilter *iface) +{ + FIXME("(%p) stub\n", iface); + return S_OK; +} + +static HRESULT sound_mod_start(IBaseFilter *iface) +{ + FIXME("(%p) stub\n", iface); + return S_OK; +} + +static HRESULT sound_mod_rate(IBaseFilter *iface) +{ + FIXME("(%p) stub\n", iface); + return S_OK; +} + + static HRESULT DSoundRender_InputPin_Construct(const PIN_INFO * pPinInfo, SAMPLEPROC pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) { InputPin * pPinImpl; @@ -315,6 +336,9 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) if (SUCCEEDED(hr)) { + MediaSeekingImpl_Init((IBaseFilter*)pDSoundRender, sound_mod_stop, sound_mod_start, sound_mod_rate, &pDSoundRender->mediaSeeking, &pDSoundRender->csFilter); + pDSoundRender->mediaSeeking.lpVtbl = &IMediaSeeking_Vtbl; + pDSoundRender->ppPins[0] = (IPin *)pDSoundRender->pInputPin; *ppv = (LPVOID)pDSoundRender; } @@ -350,6 +374,8 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri *ppv = (LPVOID)&(This->IBasicAudio_vtbl); else if (IsEqualIID(riid, &IID_IReferenceClock)) *ppv = (LPVOID)&(This->IReferenceClock_vtbl); + else if (IsEqualIID(riid, &IID_IMediaSeeking)) + *ppv = &This->mediaSeeking.lpVtbl; if (*ppv) { @@ -1071,3 +1097,53 @@ static const IReferenceClockVtbl IReferenceClock_Vtbl = ReferenceClock_AdvisePeriodic, ReferenceClock_Unadvise }; + +static inline DSoundRenderImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) +{ + return (DSoundRenderImpl *)((char*)iface - FIELD_OFFSET(DSoundRenderImpl, mediaSeeking.lpVtbl)); +} + +static HRESULT WINAPI sound_seek_QueryInterface(IMediaSeeking * iface, REFIID riid, LPVOID * ppv) +{ + DSoundRenderImpl *This = impl_from_IMediaSeeking(iface); + + return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); +} + +static ULONG WINAPI sound_seek_AddRef(IMediaSeeking * iface) +{ + DSoundRenderImpl *This = impl_from_IMediaSeeking(iface); + + return IUnknown_AddRef((IUnknown *)This); +} + +static ULONG WINAPI sound_seek_Release(IMediaSeeking * iface) +{ + DSoundRenderImpl *This = impl_from_IMediaSeeking(iface); + + return IUnknown_Release((IUnknown *)This); +} + +static const IMediaSeekingVtbl IMediaSeeking_Vtbl = +{ + sound_seek_QueryInterface, + sound_seek_AddRef, + sound_seek_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 +};

1 0

Maarten Lankhorst : quartz: Fix checking for duration.
by Alexandre Julliard 20 Mar '08

20 Mar '08

Module: wine Branch: master Commit: c53a803ab73c78519e97f4e8da9021b0576ebc15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c53a803ab73c78519e97f4e8d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 19 17:56:44 2008 -0700 quartz: Fix checking for duration. --- dlls/quartz/filtergraph.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 80b39bf..9b37594 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1914,8 +1914,8 @@ static HRESULT WINAPI FoundDuration(IFilterGraphImpl *This, IMediaSeeking *seek, if (FAILED(hr)) return hr; - /* FIXME: Minimum or maximum duration? */ - if (!*pdur < duration) + /* FIXME: Minimum or maximum duration? Assuming minimum */ + if (duration > 0 && *pdur < duration) *pdur = duration; return hr; @@ -1932,10 +1932,11 @@ static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, return E_POINTER; EnterCriticalSection(&This->cs); - *pDuration = 0; + *pDuration = -1; hr = all_renderers_seek(This, FoundDuration, (DWORD_PTR)pDuration); LeaveCriticalSection(&This->cs); + TRACE("--->%08x\n", hr); return hr; }

1 0

Dan Hipschman : qmgr: Add a stub implementation of IBackgroundCopyJob2.
by Alexandre Julliard 20 Mar '08

20 Mar '08

Module: wine Branch: master Commit: d664c276dffc1f0f53ef6700ef182ef9c8c5d70c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d664c276dffc1f0f53ef6700e… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Mar 19 15:02:02 2008 -0700 qmgr: Add a stub implementation of IBackgroundCopyJob2. --- .gitignore | 1 + dlls/qmgr/enum_files.c | 2 +- dlls/qmgr/job.c | 150 +++++++++++++++++++++++++++++++++----------- dlls/qmgr/qmgr.h | 6 +- dlls/qmgr/qmgr_local.idl | 5 +- dlls/qmgrprxy/qmgrprxy.idl | 5 +- include/Makefile.in | 1 + include/bits1_5.idl | 88 ++++++++++++++++++++++++++ 8 files changed, 215 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d664c276dffc1f0f53ef6…

1 0

Maarten Lankhorst : quartz: Fix bug in transmitting messages further.
by Alexandre Julliard 20 Mar '08

20 Mar '08

Module: wine Branch: master Commit: 3c9e2263eeedbe532ca6dbae58667c3238256bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c9e2263eeedbe532ca6dbae5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 19 17:41:15 2008 -0700 quartz: Fix bug in transmitting messages further. --- dlls/quartz/pin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 77dabf0..d5c9f15 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -113,7 +113,7 @@ static HRESULT SendFurther( IPin *from, SendPinFunc fnMiddle, LPVOID arg, SendPi { HRESULT hr_local; - hr_local = fnMiddle( pin, arg ); + hr_local = fnMiddle( connected, arg ); hr_return = updatehres( hr_return, hr_local ); IPin_Release(connected); }

1 0

Maarten Lankhorst : quartz: Transmit pullpin messages further.
by Alexandre Julliard 20 Mar '08

20 Mar '08

Module: wine Branch: master Commit: ea537b916e4a15fc39d9462445db9731f0849bec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea537b916e4a15fc39d946244… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 19 17:43:11 2008 -0700 quartz: Transmit pullpin messages further. --- dlls/quartz/pin.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index d5c9f15..1ff3d8f 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1514,26 +1514,30 @@ HRESULT PullPin_Seek(PullPin * This, REFERENCE_TIME rtStart, REFERENCE_TIME rtSt HRESULT WINAPI PullPin_EndOfStream(IPin * iface) { - FIXME("(%p)->()\n", iface); - return E_NOTIMPL; + FIXME("(%p)->() stub\n", iface); + + return SendFurther( iface, deliver_endofstream, NULL, NULL ); } HRESULT WINAPI PullPin_BeginFlush(IPin * iface) { - FIXME("(%p)->()\n", iface); - return E_NOTIMPL; + FIXME("(%p)->() stub\n", iface); + + return SendFurther( iface, deliver_beginflush, NULL, NULL ); } HRESULT WINAPI PullPin_EndFlush(IPin * iface) { - FIXME("(%p)->()\n", iface); - return E_NOTIMPL; + FIXME("(%p)->() stub\n", iface); + + return SendFurther( iface, deliver_endflush, NULL, NULL ); } HRESULT WINAPI PullPin_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) { - FIXME("(%p)->(%s, %s, %g)\n", iface, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); - return E_NOTIMPL; + FIXME("(%p)->(%s, %s, %g) stub\n", iface, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); + + return SendFurther( iface, deliver_newsegment, NULL, NULL ); } static const IPinVtbl PullPin_Vtbl =

1 0