Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[QUARTZ] Sync with Wine Staging 1.7.47. CORE-9924

Browse source 
svn path=/trunk/; revision=68526
This commit is contained in:
Amine Khaldi 2015-07-21 23:29:47 +00:00
parent b4e4e5004d
commit 46dfae3faa
8 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/directx/wine/quartz/acmwrapper.c
View file

@ -375,7 +375,7 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv)
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
*ppv = This; *ppv = &This->tf.filter.IBaseFilter_iface;
This->lasttime_real = This->lasttime_sent = -1; This->lasttime_real = This->lasttime_sent = -1;
return hr; return hr;

2
reactos/dll/directx/wine/quartz/avidec.c
View file

@ -396,7 +396,7 @@ HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv)
This->pBihIn = NULL; This->pBihIn = NULL;
This->pBihOut = NULL; This->pBihOut = NULL;
*ppv = This; *ppv = &This->tf.filter.IBaseFilter_iface;
return hr; return hr;
} }

8
reactos/dll/directx/wine/quartz/filesource.c
View file

@ -437,13 +437,13 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii
*ppv = NULL; *ppv = NULL;
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppv = This; *ppv = &This->filter.IBaseFilter_iface;
else if (IsEqualIID(riid, &IID_IPersist)) else if (IsEqualIID(riid, &IID_IPersist))
*ppv = This; *ppv = &This->filter.IBaseFilter_iface;
else if (IsEqualIID(riid, &IID_IMediaFilter)) else if (IsEqualIID(riid, &IID_IMediaFilter))
*ppv = This; *ppv = &This->filter.IBaseFilter_iface;
else if (IsEqualIID(riid, &IID_IBaseFilter)) else if (IsEqualIID(riid, &IID_IBaseFilter))
*ppv = This; *ppv = &This->filter.IBaseFilter_iface;
else if (IsEqualIID(riid, &IID_IFileSourceFilter)) else if (IsEqualIID(riid, &IID_IFileSourceFilter))
*ppv = &This->IFileSourceFilter_iface; *ppv = &This->IFileSourceFilter_iface;
else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags))

12
reactos/dll/directx/wine/quartz/filtergraph.c
View file

@ -2432,8 +2432,16 @@ static HRESULT WINAPI MediaSeeking_ConvertTimeFormat(IMediaSeeking *iface, LONGL
{ {
IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); IFilterGraphImpl *This = impl_from_IMediaSeeking(iface);
FIXME("(%p/%p)->(%p, %p, 0x%s, %p): stub !!!\n", This, iface, pTarget, TRACE("(%p/%p)->(%p, %s, 0x%s, %s)\n", This, iface, pTarget,
pTargetFormat, wine_dbgstr_longlong(Source), pSourceFormat); debugstr_guid(pTargetFormat), wine_dbgstr_longlong(Source), debugstr_guid(pSourceFormat));
if (!pSourceFormat)
pSourceFormat = &This->timeformatseek;
if (IsEqualGUID(pTargetFormat, pSourceFormat))
*pTarget = Source;
else
FIXME("conversion %s->%s not supported\n", debugstr_guid(pSourceFormat), debugstr_guid(pTargetFormat));
return S_OK; return S_OK;
} }

3
reactos/dll/directx/wine/quartz/main.c
View file

@ -23,8 +23,6 @@ extern HRESULT WINAPI QUARTZ_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLS
extern HRESULT WINAPI QUARTZ_DllCanUnloadNow(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI QUARTZ_DllCanUnloadNow(void) DECLSPEC_HIDDEN;
extern BOOL WINAPI QUARTZ_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; extern BOOL WINAPI QUARTZ_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN;
static DWORD dll_ref = 0;
/* For the moment, do nothing here. */ /* For the moment, do nothing here. */
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
{ {
@ -200,7 +198,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
*/ */
HRESULT WINAPI DllCanUnloadNow(void) HRESULT WINAPI DllCanUnloadNow(void)
{ {
if (dll_ref) return S_FALSE;
return QUARTZ_DllCanUnloadNow(); return QUARTZ_DllCanUnloadNow();
} }

4
reactos/dll/directx/wine/quartz/memallocator.c
View file

@ -107,9 +107,9 @@ static HRESULT WINAPI BaseMemAllocator_QueryInterface(IMemAllocator * iface, REF
*ppv = NULL; *ppv = NULL;
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppv = This; *ppv = &This->IMemAllocator_iface;
else if (IsEqualIID(riid, &IID_IMemAllocator)) else if (IsEqualIID(riid, &IID_IMemAllocator))
*ppv = This; *ppv = &This->IMemAllocator_iface;
if (*ppv) if (*ppv)
{ {

1
reactos/dll/directx/wine/quartz/systemclock.c
View file

@ -121,6 +121,7 @@ static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) {
it = nextit; it = nextit;
} }
if (NULL != it) timeOut = (DWORD) ((it->rtBaseTime + it->rtIntervalTime) - curTime) / (REFERENCE_TIME)10000; if (NULL != it) timeOut = (DWORD) ((it->rtBaseTime + it->rtIntervalTime) - curTime) / (REFERENCE_TIME)10000;
else timeOut = INFINITE;
/** Now Periodics Advice: semi sorted list (sort cannot be used) */ /** Now Periodics Advice: semi sorted list (sort cannot be used) */
for (it = This->pPeriodicAdvise; NULL != it; it = it->next) { for (it = This->pPeriodicAdvise; NULL != it; it = it->next) {

2
reactos/media/doc/README.WINE
View file

@ -40,7 +40,7 @@ reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.7.47
reactos/dll/directx/wine/dxgi # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/dxgi # Synced to WineStaging-1.7.47
reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.47
reactos/dll/directx/wine/qedit # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/qedit # Synced to WineStaging-1.7.37
reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.47
reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.7.37
reactos/dll/win32/activeds # Synced to WineStaging-1.7.37 reactos/dll/win32/activeds # Synced to WineStaging-1.7.37